提交初步诊断回显接口

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

@@ -12,6 +12,7 @@ import com.supervision.vo.ask.DiagnosisPrimaryVO;
 import com.supervision.vo.ask.ModifyPrimaryDiseaseInfoReqVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,55 +29,62 @@ public class AskPrimaryController {
 
     @ApiOperation("查询初步诊断列表")
     @GetMapping("queryAskPrimaryList")
-    public List<DiagnosisPrimaryVO> queryAskPrimaryList(String processId){
+    public List<DiagnosisPrimaryVO> queryAskPrimaryList(String processId) {
         return askPrimaryService.queryAskPrimaryList(processId);
     }
 
     @ApiOperation("获取初步诊断可选的下拉列表")
     @GetMapping("queryPrimaryCanChooseList")
-    public List<Disease> queryPrimaryCanChooseList(){
+    public List<Disease> queryPrimaryCanChooseList() {
         return askPrimaryService.queryPrimaryCanChooseList();
     }
 
     @ApiOperation("修改初步诊断病情依据")
     @PostMapping("modifyPrimaryDiseaseInfo")
-    public void modifyPrimaryDiseaseInfo(@RequestBody ModifyPrimaryDiseaseInfoReqVO reqVO){
+    public void modifyPrimaryDiseaseInfo(@RequestBody ModifyPrimaryDiseaseInfoReqVO reqVO) {
         askPrimaryService.modifyPrimaryDiseaseInfo(reqVO);
     }
 
     @ApiOperation("新增初步诊断")
     @PostMapping("savePrimary")
-    public void savePrimary(@RequestBody SaveDiagnosisPrimaryReqVO reqVO){
+    public void savePrimary(@RequestBody SaveDiagnosisPrimaryReqVO reqVO) {
         askPrimaryService.savePrimary(reqVO);
     }
 
     @ApiOperation("查询选择初步诊断关联的问诊记录")
     @GetMapping("queryRecordForPrimaryChoose")
-    public RecordForPrimaryChooseVO queryRecordForPrimaryChoose(@NotBlank(message = "流程ID不能为空")String processId){
+    public RecordForPrimaryChooseVO queryRecordForPrimaryChoose(@NotBlank(message = "流程ID不能为空") String processId) {
         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")
-    public void updatePrimaryByConfirm(@RequestBody DiagnosisPrimary reqVO){
+    public void updatePrimaryByConfirm(@RequestBody DiagnosisPrimary reqVO) {
         askPrimaryService.updatePrimaryByConfirm(reqVO);
     }
 
     @ApiOperation("删除初步诊断")
     @GetMapping("deletePrimary")
-    public void deletePrimary(String id){
+    public void deletePrimary(String id) {
         askPrimaryService.deletePrimary(id);
     }
 
     @ApiOperation("查询初步诊断需要填写的诊断依据")
     @GetMapping("queryDiagnosticBasisListForPrimary")
-    public List<DiagnosticBasisForPrimaryResVO> queryDiagnosticBasisListForPrimary(@NotBlank(message = "流程ID不能为空") String processId){
+    public List<DiagnosticBasisForPrimaryResVO> queryDiagnosticBasisListForPrimary(@NotBlank(message = "流程ID不能为空") String processId) {
         return askPrimaryService.queryDiagnosticBasisListForPrimary(processId);
     }
 
     @ApiOperation("确认诊断-保存诊断依据")
     @PostMapping("saveDiagnosticBasis")
-    public void saveDiagnosticBasis(@RequestBody List<DiagnosticBasisForPrimaryReqVO> reqVO){
+    public void saveDiagnosticBasis(@RequestBody List<DiagnosticBasisForPrimaryReqVO> reqVO) {
         askPrimaryService.saveDiagnosticBasis(reqVO);
     }
 }

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

@@ -1,5 +1,6 @@
 package com.supervision.pojo.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -8,4 +9,10 @@ public class ChooseNode {
     private String nodeId;
 
     private String name;
+
+    /**
+     * 是否选中
+     */
+    @ApiModelProperty("是否选中")
+    private boolean isChecked;
 }

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

@@ -8,6 +8,7 @@ import com.supervision.pojo.vo.SaveDiagnosisPrimaryReqVO;
 import com.supervision.vo.ask.DiagnosticBasisForPrimaryResVO;
 import com.supervision.vo.ask.DiagnosisPrimaryVO;
 import com.supervision.vo.ask.ModifyPrimaryDiseaseInfoReqVO;
+import io.swagger.annotations.ApiParam;
 
 import java.util.List;
 
@@ -23,6 +24,8 @@ 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

@@ -138,6 +138,24 @@ 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) {
         diagnosisPrimaryService.lambdaUpdate().set(DiagnosisPrimary::getExcludeFlag, reqVO.getExcludeFlag())