代码优化

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

@@ -50,7 +50,7 @@ public class AskPrimaryController {
     }
 
     @ApiOperation("查询选择初步诊断关联的问诊记录")
-    @PostMapping("queryRecordForPrimaryChoose")
+    @GetMapping("queryRecordForPrimaryChoose")
     public RecordForPrimaryChooseVO queryRecordForPrimaryChoose(String processId){
         return askPrimaryService.queryRecordForPrimaryChoose(processId);
     }

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

@@ -1,5 +1,7 @@
 package com.supervision.pojo.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.supervision.model.DiagnosisPrimary;
 import com.supervision.model.DiagnosisPrimaryRelation;
 import io.swagger.annotations.ApiModel;
@@ -9,14 +11,33 @@ import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
-@EqualsAndHashCode(callSuper = true)
 @Data
-@ApiModel(parent = DiagnosisPrimary.class)
+@ApiModel
-public class SaveDiagnosisPrimaryReqVO extends DiagnosisPrimary {
+public class SaveDiagnosisPrimaryReqVO  {
 
-    // 关联的初步诊断列表
+    /**
-    @ApiModelProperty("关联的初步诊断列表")
+     * 诊断流程ID
-    private RecordForPrimaryChooseVO choose;
+     */
+    @ApiModelProperty("诊断流程ID")
+    private String processId;
+
+    /**
+     * 初步诊断疾病,关联disease表ID
+     */
+    @ApiModelProperty("初步诊断疾病ID,关联disease表ID")
+    private String primaryDiagnosisId;
+
+    @ApiModelProperty("患者病情(初步诊断填写)")
+    private String patientDiseaseInfo;
+
+    @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/service/impl/AskPrimaryServiceImpl.java

@@ -62,14 +62,13 @@ public class AskPrimaryServiceImpl implements AskPrimaryService {
         diagnosisPrimary.setCreateUserId(UserUtil.getUser().getId());
         diagnosisPrimaryService.save(diagnosisPrimary);
         // 然后开始保存初步诊断关键的诊断
-        RecordForPrimaryChooseVO choose = reqVO.getChoose();
+        if (CollUtil.isNotEmpty(reqVO.getAskIdList())){
-        if (CollUtil.isNotEmpty(choose.getAskList())){
+            List<DiagnosisPrimaryRelation> askRelationList = reqVO.getAskIdList().stream().map(e -> {
-            List<DiagnosisPrimaryRelation> askRelationList = choose.getAskList().stream().map(e -> {
                 DiagnosisPrimaryRelation relation = new DiagnosisPrimaryRelation();
                 relation.setProcessId(diagnosisPrimary.getProcessId());
                 relation.setPrimaryId(diagnosisPrimary.getId());
                 relation.setType(1);
-                relation.setRelationId(e.getNodeId());
+                relation.setRelationId(e);
                 relation.setCreateUserId(UserUtil.getUser().getId());
                 return relation;
             }).collect(Collectors.toList());
@@ -77,13 +76,13 @@ public class AskPrimaryServiceImpl implements AskPrimaryService {
 
         }
 
-        if (CollUtil.isNotEmpty(choose.getPhysicalList())){
+        if (CollUtil.isNotEmpty(reqVO.getPhysicalIdList())){
-            List<DiagnosisPrimaryRelation> physicalRelationList = choose.getPhysicalList().stream().map(e -> {
+            List<DiagnosisPrimaryRelation> physicalRelationList = reqVO.getPhysicalIdList().stream().map(e -> {
                 DiagnosisPrimaryRelation relation = new DiagnosisPrimaryRelation();
                 relation.setProcessId(diagnosisPrimary.getProcessId());
                 relation.setPrimaryId(diagnosisPrimary.getId());
                 relation.setType(2);
-                relation.setRelationId(e.getNodeId());
+                relation.setRelationId(e);
                 relation.setCreateUserId(UserUtil.getUser().getId());
                 return relation;
             }).collect(Collectors.toList());
@@ -91,13 +90,13 @@ public class AskPrimaryServiceImpl implements AskPrimaryService {
 
         }
 
-        if (CollUtil.isNotEmpty(choose.getAncillaryList())){
+        if (CollUtil.isNotEmpty(reqVO.getAncillaryIdList())){
-            List<DiagnosisPrimaryRelation> ancillaryRelationList = choose.getAncillaryList().stream().map(e -> {
+            List<DiagnosisPrimaryRelation> ancillaryRelationList = reqVO.getAncillaryIdList().stream().map(e -> {
                 DiagnosisPrimaryRelation relation = new DiagnosisPrimaryRelation();
                 relation.setProcessId(diagnosisPrimary.getProcessId());
                 relation.setPrimaryId(diagnosisPrimary.getId());
                 relation.setType(3);
-                relation.setRelationId(e.getNodeId());
+                relation.setRelationId(e);
                 relation.setCreateUserId(UserUtil.getUser().getId());
                 return relation;
             }).collect(Collectors.toList());