manage: alter table vp_disease_ancillary添加normal_result

vp_disease_physical 添加 normal_result

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

@@ -97,13 +97,11 @@ public class DiseaseManageServiceImpl implements DiseaseManageService {
     @Override
     public IPage<? extends Disease> queryPageList(Integer pageNum, Integer pageSize, DiseaseReqVo diseaseReqVo) {
 
-
         if (null == diseaseReqVo.getDiseaseType()){
             diseaseReqVo.setDiseaseType(0);
         }
 
         IPage<? extends Disease> page = diseaseService.queryPageList(pageNum, pageSize, diseaseReqVo);
-
         if (page.getSize() == 0) {
             return page;
         }

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

@@ -60,10 +60,20 @@ public class DiseaseAncillary implements Serializable {
 
     /**
      * 结果
+     * 当预期结果为正常：结果值为正常结果；
+     * 当预期结果为不正常：结果值为不正常结果；
      */
     @ApiModelProperty("结果")
     private String result;
 
+    /**
+     * 正常结果：
+     * 只有当预期结果为异常时，才会有值
+     */
+
+    @ApiModelProperty("正常结果")
+    private String normalResult;
+
     /**
      * 说明
      */

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

@@ -68,11 +68,14 @@ public class DiseasePhysical implements Serializable {
     private Integer locationDiagnosisFlag;
 
     /**
-     * 结果
+     * 结果(异常结果)
      */
     @ApiModelProperty("结果")
     private String result;
 
+    @ApiModelProperty("正常结果")
+    private String normalResult;
+
     /**
      * 表征
      */

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

@@ -17,6 +17,7 @@
         <result property="diagnosisAssessmentFlag" column="diagnosis_assessment_flag" jdbcType="INTEGER"/>
         <result property="expectedDiagnosisResult" column="expected_diagnosis_result" jdbcType="INTEGER"/>
         <result property="result" column="result" jdbcType="VARCHAR"/>
+        <result property="normalResult" column="normal_result" jdbcType="VARCHAR"/>
         <result property="description" column="description" jdbcType="VARCHAR"/>
         <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
@@ -28,7 +29,7 @@
         id
         ,disease_id,item_id,require_check_flag,basis_confirm_flag,primarily_diagnosis_criteria_flag,basis_identification_flag
           ,full_check_flag,diagnosis_assessment_flag,expected_diagnosis_result,
-        result,symptom_image_file_ids,description,create_user_id,
+        result,normal_result,symptom_image_file_ids,description,create_user_id,
         create_time,update_user_id,update_time
     </sql>
 
@@ -41,6 +42,7 @@
         da.basis_confirm_flag as basisConfirmFlag,
         da.basis_identification_flag as basisIdentificationFlag,
         da.result as result,
+        da.normal_result as normalResult,
         da.description as description,
         da.create_time as createTime,
         da.create_user_id as createUserId,
@@ -73,6 +75,7 @@
                da.expected_diagnosis_result         as expectedDiagnosisResult,
                da.require_check_flag                as requireCheckFlag,
                da.result                            as result,
+               da.normal_result                     as normalResult,
                da.description                       as description
         from vp_disease_ancillary da
                  left join vp_config_ancillary_item cai on da.item_id = cai.id

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

@@ -18,6 +18,7 @@
             <result property="fullCheckFlag" column="full_check_flag" jdbcType="INTEGER"/>
             <result property="locationDiagnosisFlag" column="location_diagnosis_flag" jdbcType="INTEGER"/>
             <result property="result" column="result" jdbcType="VARCHAR"/>
+            <result property="normalResult" column="normal_result" jdbcType="VARCHAR"/>
             <result property="trait" column="trait" jdbcType="VARCHAR"/>
             <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
@@ -29,7 +30,7 @@
         id,tool_id,location_id,disease_id,
         require_check_flag,primarily_diagnosis_criteria_flag,basis_confirm_flag,
         diagnosis_assessment_flag,expected_diagnosis_result,full_check_flag,
-        basis_identification_flag,result,trait,
+        basis_identification_flag,result,normal_result,trait,
         create_user_id,create_time,update_user_id,
         update_time
     </sql>
@@ -52,6 +53,7 @@
                dp.expected_diagnosis_result         as expectedDiagnosisResult,
                dp.require_check_flag                as requireCheckFlag,
                dp.result                            as result,
+               dp.normal_result                     as normalResult,
                dp.trait                             as trait
         from vp_disease_physical dp
                  left join vp_config_physical_tool cpt on dp.tool_id = cpt.id