bugfix:修复问题

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

@@ -33,10 +33,10 @@
                t1.basis_confirm_flag        as recordBasisConfirmFlag,
                t1.basis_identification_flag as recordBasisIdentificationFlag,
                t1.id                        as recordId,
-               t3.id                        as itemId
+               t1.item_id                        as itemId
         from vp_diagnosis_ancillary_record t1
                  left join vp_disease_ancillary t2 on t1.ancillary_id = t2.id
-                 left join vp_config_ancillary_item t3 on t2.item_id = t3.id
+                 left join vp_config_ancillary_item t3 on t1.item_id = t3.id
         where t1.process_id = #{processId}
     </select>
 

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

@@ -31,7 +31,6 @@
         select (IF(t4.location_name IS NULL, t3.tool_name,
                    CONCAT_WS(' | ', t3.tool_name, t4.location_name))) AS toolLocationName,
                t1.id                                                  as recordId,
-
                t1.basis_confirm_flag                                  as recordBasisConfirmFlag,
                t1.basis_identification_flag                           as recordBasisIdentificationFlag,
                t2.primarily_diagnosis_criteria_flag                   as primarilyDiagnosisCriteriaFlag,

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

@@ -10,7 +10,8 @@
         <result property="itemId" column="item_id" jdbcType="VARCHAR"/>
         <result property="requireCheckFlag" column="require_check_flag" jdbcType="INTEGER"/>
         <result property="basisConfirmFlag" column="basis_confirm_flag" jdbcType="INTEGER"/>
-        <result property="primarilyDiagnosisCriteriaFlag" column="primarily_diagnosis_criteria_flag" jdbcType="INTEGER"/>
+        <result property="primarilyDiagnosisCriteriaFlag" column="primarily_diagnosis_criteria_flag"
+                jdbcType="INTEGER"/>
         <result property="basisIdentificationFlag" column="basis_identification_flag" jdbcType="INTEGER"/>
         <result property="fullCheckFlag" column="full_check_flag" jdbcType="INTEGER"/>
         <result property="diagnosisAssessmentFlag" column="diagnosis_assessment_flag" jdbcType="INTEGER"/>
@@ -24,28 +25,30 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,disease_id,item_id,require_check_flag,basis_confirm_flag,primarily_diagnosis_criteria_flag,basis_identification_flag
+        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,description,create_user_id,
         create_time,update_user_id,update_time
     </sql>
 
-    <select id="queryDiseaseAncillaryDtoList" parameterType="com.supervision.model.DiseaseAncillary" resultType="com.supervision.dto.DiseaseAncillaryDto">
-        select da.id            as id,
-        da.disease_id           as diseaseId,
-        da.item_id              as itemId,
-        da.require_check_flag        as requireCheckFlag,
-        da.basis_confirm_flag        as basisConfirmFlag,
+    <select id="queryDiseaseAncillaryDtoList" parameterType="com.supervision.model.DiseaseAncillary"
+            resultType="com.supervision.dto.DiseaseAncillaryDto">
+        select da.id as id,
+        da.disease_id as diseaseId,
+        da.item_id as itemId,
+        da.require_check_flag as requireCheckFlag,
+        da.basis_confirm_flag as basisConfirmFlag,
         da.basis_identification_flag as basisIdentificationFlag,
-        da.result               as result,
-        da.description          as description,
-        da.create_time          as createTime,
-        da.create_user_id       as createUserId,
-        da.update_user_id       as updateUserId,
-        da.update_time          as updateTime,
-        ca.item_name            as itemName
+        da.result as result,
+        da.description as description,
+        da.create_time as createTime,
+        da.create_user_id as createUserId,
+        da.update_user_id as updateUserId,
+        da.update_time as updateTime,
+        ca.item_name as itemName
         from vp_disease_ancillary da
-            join vp_config_ancillary_item ca on da.item_id = ca.id
+        join vp_config_ancillary_item ca on da.item_id = ca.id
         <where>
             <if test="diseaseAncillary.diseaseId != null and diseaseAncillary.diseaseId != ''">
                 AND da.disease_id = #{diseaseAncillary.diseaseId}
@@ -73,7 +76,8 @@
                da.description                       as description
         from vp_disease_ancillary da
                  left join vp_config_ancillary_item cai on da.item_id = cai.id
-        where da.disease_id = #{diseaseId} order by da.create_time desc
+        where da.disease_id = #{diseaseId}
+        order by da.create_time desc
     </select>
 
 </mapper>