提交初步诊断回显接口

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

@@ -1,14 +1,26 @@
 package com.supervision.vo.ask;
 
 import com.supervision.model.DiagnosisPrimary;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class DiagnosisPrimaryVO extends DiagnosisPrimary {
 
     private String primaryDiseaseName;
 
+    @ApiModelProperty("问诊ID列表")
+    private List<String> askIdList;
+
+    @ApiModelProperty("辅助检查ID列表")
+    private List<String> ancillaryIdList;
+
+    @ApiModelProperty("体格检查ID列表")
+    private List<String> physicalIdList;
+
 
 }

virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java

@@ -57,12 +57,6 @@ public class AskPrimaryController {
         return askPrimaryService.queryRecordForPrimaryChoose(processId);
     }
 
-    @ApiOperation("查询已选择的初步诊断关联的问诊记录")
-    @GetMapping("queryPrimaryChooseList")
-    public RecordForPrimaryChooseVO queryPrimaryChooseList(@NotBlank(message = "流程ID不能为空") String processId,
-                                                           @NotBlank(message = "初步诊断ID不能为空") @ApiParam("初步诊断ID") String primaryId) {
-        return askPrimaryService.queryPrimaryChooseList(processId, primaryId);
-    }
 
     @ApiOperation("确认诊断时,修改初步诊断的信息")
     @PostMapping("updatePrimaryByConfirm")

virtual-patient-web/src/main/java/com/supervision/pojo/vo/ChooseNode.java

@@ -9,10 +9,4 @@ public class ChooseNode {
     private String nodeId;
 
     private String name;
-
-    /**
-     * 是否选中
-     */
-    @ApiModelProperty("是否选中")
-    private boolean checkedFlag;
 }

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

@@ -24,8 +24,6 @@ public interface AskPrimaryService {
 
     RecordForPrimaryChooseVO queryRecordForPrimaryChoose(String processId);
 
-    RecordForPrimaryChooseVO queryPrimaryChooseList(String processId, String primaryId);
-
     void updatePrimaryByConfirm(DiagnosisPrimary reqVO);
 
     void deletePrimary(String id);

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

@@ -40,7 +40,22 @@ public class AskPrimaryServiceImpl implements AskPrimaryService {
 
     @Override
     public List<DiagnosisPrimaryVO> queryAskPrimaryList(String processId) {
-        return diagnosisPrimaryService.queryAskPrimaryList(processId);
+        List<DiagnosisPrimaryVO> resVoList = diagnosisPrimaryService.queryAskPrimaryList(processId);
+        List<DiagnosisPrimaryRelation> list = diagnosisPrimaryRelationService.lambdaQuery().eq(DiagnosisPrimaryRelation::getProcessId, processId).list();
+        if (CollUtil.isNotEmpty(list)){
+            Map<String, List<DiagnosisPrimaryRelation>> relationMap = list.stream().collect(Collectors.groupingBy(DiagnosisPrimaryRelation::getPrimaryId));
+            for (DiagnosisPrimaryVO diagnosisPrimaryVO : resVoList) {
+                List<DiagnosisPrimaryRelation> relationList = relationMap.get(diagnosisPrimaryVO.getId());
+                if (CollUtil.isNotEmpty(relationList)){
+                    Map<Integer, List<String>> relationIdMap = relationList.stream()
+                            .collect(Collectors.groupingBy(DiagnosisPrimaryRelation::getType, Collectors.mapping(DiagnosisPrimaryRelation::getRelationId, Collectors.toList())));
+                    diagnosisPrimaryVO.setAskIdList(relationIdMap.get(1));
+                    diagnosisPrimaryVO.setPhysicalIdList(relationIdMap.get(2));
+                    diagnosisPrimaryVO.setAncillaryIdList(relationIdMap.get(3));
+                }
+            }
+        }
+        return resVoList;
     }
 
     @Override
@@ -138,23 +153,7 @@ public class AskPrimaryServiceImpl implements AskPrimaryService {
         return resVO;
     }
 
-    @Override
+
-    public RecordForPrimaryChooseVO queryPrimaryChooseList(String processId, String primaryId) {
-        RecordForPrimaryChooseVO resVO = queryRecordForPrimaryChoose(processId);
-        // 获取relation表的数据
-        List<DiagnosisPrimaryRelation> relationList = diagnosisPrimaryRelationService.lambdaQuery().eq(DiagnosisPrimaryRelation::getPrimaryId, primaryId).list();
-        Set<String> relationSet = relationList.stream().map(DiagnosisPrimaryRelation::getRelationId).collect(Collectors.toSet());
-        for (ChooseNode chooseNode : resVO.getAskList()) {
-            chooseNode.setChecked(relationSet.contains(chooseNode.getNodeId()));
-        }
-        for (ChooseNode chooseNode : resVO.getPhysicalList()) {
-            chooseNode.setChecked(relationSet.contains(chooseNode.getNodeId()));
-        }
-        for (ChooseNode chooseNode : resVO.getAncillaryList()) {
-            chooseNode.setChecked(relationSet.contains(chooseNode.getNodeId()));
-        }
-        return resVO;
-    }
 
     @Override
     public void updatePrimaryByConfirm(DiagnosisPrimary reqVO) {