病历管理代码提交

virtual-patient-common/src/main/java/com/supervision/config/RequestLogConfig.java

@@ -1,5 +1,6 @@
 package com.supervision.config;
 
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONException;
 import cn.hutool.json.JSONUtil;
 import lombok.Data;
@@ -60,7 +61,7 @@ public class RequestLogConfig {
 		} catch (JSONException e) {
 			value = result.toString();
 		}
-		if (value.length() > 10240){
+		if (StrUtil.isNotBlank(value) && value.length() > 10240){
 			value = value.substring(0, 1024) + "......" + value.substring(value.length() - 1024);
 			return value;
 		}

virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java

@@ -75,12 +75,13 @@ public class MedicalRecManageController {
         return medicalRecManageService.queryDiseaseTreatmentPlanByCreat(diseaseId);
     }
 
-    @ApiOperation("创建病历时,应答策略查询问题(目前只支持单一疾病)")
+    @ApiOperation("创建病历时,根据疾病ID查询配置的问题(目前只支持单一疾病)")
     @GetMapping("queryQuestionListByCreat")
     public List<MedicalRecQaVO> queryQuestionListByCreat(String diseaseId) {
         return medicalRecManageService.queryQuestionListByCreat(diseaseId);
     }
 
+
     @ApiOperation("修改病历")
     @PostMapping("modifyMedicalRec")
     public void modifyMedicalRec(@RequestBody MedicalRecManageVO reqVO) {

virtual-patient-manage/src/main/java/com/supervision/manage/service/MedicalRecManageService.java

@@ -33,6 +33,7 @@ public interface MedicalRecManageService {
 
     List<MedicalRecQaVO> queryQuestionListByCreat(String diseaseId);
 
+
     void modifyMedicalRec(MedicalRecManageVO reqVO);
 
     MedicalRecInfoVO queryMedicalRecInfo(String id);

virtual-patient-model/src/main/java/com/supervision/model/Patient.java

@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.supervision.handler.StringListTypeHandler;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -19,9 +21,11 @@ import java.util.List;
  *
  * @TableName vp_patient
  */
+@EqualsAndHashCode(callSuper = true)
 @TableName(value = "vp_patient")
 @Data
 @ApiModel
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Patient extends Model<Patient> implements Serializable {
     /**
      * 主键

virtual-patient-model/src/main/java/com/supervision/vo/manage/AskQuestionLibraryResVo.java

@@ -11,6 +11,9 @@ public class AskQuestionLibraryResVo {
     @ApiModelProperty("主键")
     private String id;
 
+    @ApiModelProperty("问题库ID")
+    private  String libraryQuestionId;
+
     @ApiModelProperty("编码")
     private String code;
 

virtual-patient-model/src/main/resources/mapper/AskTemplateQuestionLibraryMapper.xml

@@ -29,7 +29,9 @@
     <resultMap id="askQuestionLibraryResultMap" type="com.supervision.vo.manage.AskQuestionLibraryResVo">
         <id property="id" column="id" />
         <result property="code" column="code" />
+        <result property="code" column="code" />
         <result property="dictId" column="dictId" />
+        <result property="libraryQuestionId" column="libraryQuestionId" />
         <result property="question" column="question" typeHandler="com.supervision.handler.StringListTypeHandler" />
         <result property="nameZhPath" column="nameZhPath" />
     </resultMap>
@@ -37,6 +39,7 @@
     <select id="queryList" resultMap="askQuestionLibraryResultMap" parameterType="com.supervision.vo.manage.AskQuestionLibraryReqVo">
         select atql.id as id,
                atql.default_answer,
+               atql.id as libraryQuestionId,
                cd.code as code,
                atql.dict_id as dictId,
                atql.question as question,
@@ -54,6 +57,7 @@
         select  atql.id as id,
                 atql.default_answer,
                 cd.code as code,
+                atql.id as libraryQuestionId,
                 atql.dict_id as dictId,
                 atql.question as question,
                 cd.name_zh_path as nameZhPath