提交辅助检查的修改

virtual-patient-model/src/main/java/com/supervision/vo/ask/AskAncillaryHistoryResVO.java

@@ -29,6 +29,9 @@ public class AskAncillaryHistoryResVO {
     @ApiModelProperty("关联的初步诊断ID")
     private String primaryId;
 
+    @ApiModelProperty("是否诊断判读 0不需要 1需要")
+    private Integer diagnosisAssessmentFlag;
+
     @ApiModelProperty("关联的初步诊断")
     private List<DiagnosisPrimaryVO> primaryList;
 

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

@@ -9,7 +9,6 @@
         <result property="ancillaryId" column="ancillary_id" jdbcType="VARCHAR"/>
         <result property="processId" column="process_id" jdbcType="VARCHAR"/>
         <result property="itemId" column="item_id" jdbcType="VARCHAR"/>
-        <result property="primaryId" column="primary_id" jdbcType="VARCHAR"/>
         <result property="result" column="result" jdbcType="VARCHAR"/>
         <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
@@ -38,13 +37,16 @@
     </select>
 
     <select id="queryAncillaryRecord" resultType="com.supervision.vo.ask.AskAncillaryHistoryResVO">
-        select t2.item_name   as itemName,
+        select t2.item_name                 as itemName,
-               t2.id          as itemId,
+               t2.id                        as itemId,
-               t1.result      as result,
+               t1.result                    as result,
-               t1.id          as id,
+               t1.id                        as id,
-               t1.create_time as createTime
+               t3.diagnosis_assessment_flag as diagnosisAssessmentFlag,
+               t1.create_time               as createTime
         from vp_diagnosis_ancillary_record t1
                  left join vp_config_ancillary_item t2 on t1.item_id = t2.id
-        where t1.process_id = #{processId} order by t1.create_time desc
+                 left join vp_disease_ancillary t3 on t1.ancillary_id = t3.id
+        where t1.process_id = #{processId}
+        order by t1.create_time desc
     </select>
 </mapper>

virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java

@@ -127,6 +127,7 @@ public class AskAncillaryServiceImpl implements AskAncillaryService {
         // 对于item相同的,primaryId不同的,进行合并
         Map<String, List<AskAncillaryHistoryResVO>> resMap = distinctItemIdAndPrimaryIdList.stream()
                 .collect(Collectors.groupingBy(AskAncillaryHistoryResVO::getPrimaryId));
+
         for (Map.Entry<String, List<AskAncillaryHistoryResVO>> entry : resMap.entrySet()) {
             List<AskAncillaryHistoryResVO> value = entry.getValue();
             List<DiagnosisPrimaryVO> diagnosisPrimaryList = new ArrayList<>();