1: 重构 病历体格检查和辅助检查保存和修改接口

virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java

@@ -158,34 +158,34 @@ public class MedicalRecManageController {
 
     @Operation(summary = "保存病历关联的体格检查信息")
     @PostMapping("saveMedicalRecPhysical")
-    public String saveMedicalRecPhysical(@RequestBody MedicalRecPhysicalReqVo medicalRecPhysicalReqVo) {
+    public String saveMedicalRecPhysical(@RequestBody DiseasePhysicalReqVo diseasePhysicalReqVo) {
-        medicalRecPhysicalReqVo.floatDiagnosticCriteria();
+        diseasePhysicalReqVo.floatDiagnosticCriteria();
-        DiseasePhysical result = medicalRecManageService.saveMedicalRecPhysical(medicalRecPhysicalReqVo);
+        DiseasePhysical result = medicalRecManageService.saveMedicalRecPhysical(diseasePhysicalReqVo);
         return result.getId();
     }
 
     @Operation(summary = "更新病历关联的体格检查信息")
     @PostMapping("updateMedicalRecPhysical")
-    public Boolean updateMedicalRecPhysical(@RequestBody MedicalRecPhysicalReqVo medicalRecPhysicalReqVo) {
+    public Boolean updateMedicalRecPhysical(@RequestBody DiseasePhysicalReqVo diseasePhysicalReqVo) {
-        medicalRecPhysicalReqVo.floatDiagnosticCriteria();
+        diseasePhysicalReqVo.floatDiagnosticCriteria();
-        return medicalRecManageService.updateMedicalRecPhysical(medicalRecPhysicalReqVo);
+        return medicalRecManageService.updateMedicalRecPhysical(diseasePhysicalReqVo);
     }
 
     @Operation(summary = "保存病历关联的辅助检查信息")
     @PostMapping("saveMedicalRecAncillary")
-    public String saveMedicalRecAncillary(@RequestBody MedicalRecAncillaryReqVo medicalRecAncillaryReqVo) {
+    public String saveMedicalRecAncillary(@RequestBody DiseaseAncillaryReqVo diseaseAncillaryReqVo) {
 
-        medicalRecAncillaryReqVo.floatDiagnosticCriteria();
+        diseaseAncillaryReqVo.floatDiagnosticCriteria();
-        DiseaseAncillary result = medicalRecManageService.saveMedicalRecAncillary(medicalRecAncillaryReqVo);
+        DiseaseAncillary result = medicalRecManageService.saveMedicalRecAncillary(diseaseAncillaryReqVo);
         return result.getId();
     }
 
     @Operation(summary = "更新病历关联的辅助检查信息")
     @PostMapping("updateMedicalRecAncillary")
-    public Boolean updateMedicalRecAncillary(@RequestBody MedicalRecAncillaryReqVo medicalRecAncillaryReqVo) {
+    public Boolean updateMedicalRecAncillary(@RequestBody DiseaseAncillaryReqVo diseaseAncillaryReqVo) {
 
-        medicalRecAncillaryReqVo.floatDiagnosticCriteria();
+        diseaseAncillaryReqVo.floatDiagnosticCriteria();
-        return medicalRecManageService.updateMedicalRecAncillary(medicalRecAncillaryReqVo);
+        return medicalRecManageService.updateMedicalRecAncillary(diseaseAncillaryReqVo);
     }
 
 

virtual-patient-manage/src/main/java/com/supervision/manage/service/MedicalRecManageService.java

@@ -53,11 +53,11 @@ public interface MedicalRecManageService {
 
     MedicalRecInfoReVo queryMedicalRecBaseInfo(String medicalRecId);
 
-    DiseasePhysical saveMedicalRecPhysical(MedicalRecPhysicalReqVo medicalRecPhysicalReqVo);
+    DiseasePhysical saveMedicalRecPhysical(DiseasePhysicalReqVo diseasePhysicalReqVo);
 
-    DiseaseAncillary saveMedicalRecAncillary(MedicalRecAncillaryReqVo medicalRecAncillaryReqVo);
+    DiseaseAncillary saveMedicalRecAncillary(DiseaseAncillaryReqVo diseaseAncillaryReqVo);
 
-    Boolean updateMedicalRecPhysical(MedicalRecPhysicalReqVo medicalRecPhysicalReqVo);
+    Boolean updateMedicalRecPhysical(DiseasePhysicalReqVo diseasePhysicalReqVo);
 
-    Boolean updateMedicalRecAncillary(MedicalRecAncillaryReqVo medicalRecAncillaryReqVo);
+    Boolean updateMedicalRecAncillary(DiseaseAncillaryReqVo diseaseAncillaryReqVo);
 }

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java

@@ -470,40 +470,35 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
     }
 
     @Override
-    public DiseasePhysical saveMedicalRecPhysical(MedicalRecPhysicalReqVo medicalRecPhysicalReqVo) {
+    public DiseasePhysical saveMedicalRecPhysical(DiseasePhysicalReqVo diseasePhysicalReqVo) {
 
-        DiseasePhysical diseasePhysical = BeanUtil.toBean(medicalRecPhysicalReqVo, DiseasePhysical.class);
+        diseasePhysicalReqVo.setDiseaseId(diseasePhysicalReqVo.getMedicalId());
-        diseasePhysical.setDiseaseId(medicalRecPhysicalReqVo.getMedicalId());
+        diseasePhysicalReqVo.setRelationType(1);
-        diseasePhysical.setRelationType(1);
+        return diseasePhysicalManageService.savePhysical(diseasePhysicalReqVo);
-        return diseasePhysicalManageService.savePhysical(diseasePhysical);
     }
 
     @Override
-    public DiseaseAncillary saveMedicalRecAncillary(MedicalRecAncillaryReqVo medicalRecAncillaryReqVo) {
+    public DiseaseAncillary saveMedicalRecAncillary(DiseaseAncillaryReqVo diseaseAncillaryReqVo) {
 
-        DiseaseAncillary diseaseAncillary = BeanUtil.toBean(medicalRecAncillaryReqVo, DiseaseAncillary.class);
+        diseaseAncillaryReqVo.setDiseaseId(diseaseAncillaryReqVo.getMedicalId());
-        diseaseAncillary.setDiseaseId(medicalRecAncillaryReqVo.getMedicalId());
+        diseaseAncillaryReqVo.setRelationType(1);
-        diseaseAncillary.setRelationType(1);
 
-        return diseaseAncillaryManageService.saveAncillary(diseaseAncillary);
+        return diseaseAncillaryManageService.saveAncillary(diseaseAncillaryReqVo);
     }
 
     @Override
-    public Boolean updateMedicalRecPhysical(MedicalRecPhysicalReqVo medicalRecPhysicalReqVo) {
+    public Boolean updateMedicalRecPhysical(DiseasePhysicalReqVo diseasePhysicalReqVo) {
 
-        DiseasePhysical diseasePhysical = BeanUtil.toBean(medicalRecPhysicalReqVo, DiseasePhysical.class);
+        diseasePhysicalReqVo.setDiseaseId(diseasePhysicalReqVo.getMedicalId());
-        diseasePhysical.setDiseaseId(medicalRecPhysicalReqVo.getMedicalId());
 
-        return diseasePhysicalManageService.updatePhysical(diseasePhysical);
+        return diseasePhysicalManageService.updatePhysical(diseasePhysicalReqVo);
     }
 
     @Override
-    public Boolean updateMedicalRecAncillary(MedicalRecAncillaryReqVo medicalRecAncillaryReqVo) {
+    public Boolean updateMedicalRecAncillary(DiseaseAncillaryReqVo diseaseAncillaryReqVo) {
 
-        DiseaseAncillary diseaseAncillary = BeanUtil.toBean(medicalRecAncillaryReqVo, DiseaseAncillary.class);
+        diseaseAncillaryReqVo.setDiseaseId(diseaseAncillaryReqVo.getMedicalId());
-        diseaseAncillary.setDiseaseId(medicalRecAncillaryReqVo.getMedicalId());
+        return diseaseAncillaryManageService.updateAncillary(diseaseAncillaryReqVo);
-
-        return diseaseAncillaryManageService.updateAncillary(diseaseAncillary);
     }
 
     private void saveMedicalRecAssert(MedicalRecInfoReVo reqVO){

virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java

@@ -30,6 +30,10 @@ public class DiseaseAncillary implements Serializable {
     @Schema(description = "疾病id")
     private String diseaseId;
 
+    @TableField(exist = false)
+    @Schema(description = "病历id 与diseaseId的值相对")
+    private String medicalId;
+
     /**
      * 工具ID
      */

virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java

@@ -29,6 +29,10 @@ public class DiseasePhysical implements Serializable {
      */
     @Schema(description = "疾病id")
     private String diseaseId;
+
+    @TableField(exist = false)
+    @Schema(description = "病历id 与diseaseId的值相对")
+    private String medicalId;
     /**
      * 工具ID
      */

virtual-patient-model/src/main/java/com/supervision/vo/manage/MedicalRecAncillaryReqVo.java

@@ -1,39 +0,0 @@
-package com.supervision.vo.manage;
-
-import com.supervision.model.DiseaseAncillary;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class MedicalRecAncillaryReqVo extends DiseaseAncillary {
-
-    @Schema(description = "病历id")
-    private String medicalId;
-
-    @Schema(description = "诊断依据 0：初步诊断依据 1：证实诊断依据 2：鉴别诊断依据 3：全面诊断依据")
-    private List<Integer> diagnosticCriteria;
-
-    /**
-     * 离散诊断依据 通过诊断依据中的数据设置 primarilyDiagnosisCriteriaFlag basisConfirmFlag basisIdentificationFlag fullCheckFlag
-     */
-    public void floatDiagnosticCriteria(){
-
-        if (null == diagnosticCriteria){
-            diagnosticCriteria =  new ArrayList<>();
-        }
-
-        super.setPrimarilyDiagnosisCriteriaFlag(diagnosticCriteria.contains(0) ? 1 : 0);
-
-        super.setBasisConfirmFlag(diagnosticCriteria.contains(1) ? 1 : 0);
-
-        super.setBasisIdentificationFlag(diagnosticCriteria.contains(2) ? 1 : 0);
-
-        super.setFullCheckFlag(diagnosticCriteria.contains(3) ? 1 : 0);
-
-    }
-}

virtual-patient-model/src/main/java/com/supervision/vo/manage/MedicalRecPhysicalReqVo.java

@@ -1,41 +0,0 @@
-package com.supervision.vo.manage;
-
-import com.supervision.model.DiseaseAncillary;
-import com.supervision.model.DiseasePhysical;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class MedicalRecPhysicalReqVo extends DiseaseAncillary {
-
-    @Schema(description = "病历id")
-    private String medicalId;
-
-    @Schema(description = "诊断依据 0：初步诊断依据 1：证实诊断依据 2：鉴别诊断依据 3：全面诊断依据")
-    private List<Integer> diagnosticCriteria;
-
-
-    /**
-     * 离散诊断依据 通过诊断依据中的数据设置 primarilyDiagnosisCriteriaFlag basisConfirmFlag basisIdentificationFlag fullCheckFlag
-     */
-    public void floatDiagnosticCriteria(){
-
-        if (null == diagnosticCriteria){
-            diagnosticCriteria =  new ArrayList<>();
-        }
-
-        super.setPrimarilyDiagnosisCriteriaFlag(diagnosticCriteria.contains(0) ? 1 : 0);
-
-        super.setBasisConfirmFlag(diagnosticCriteria.contains(1) ? 1 : 0);
-
-        super.setBasisIdentificationFlag(diagnosticCriteria.contains(2) ? 1 : 0);
-
-        super.setFullCheckFlag(diagnosticCriteria.contains(3) ? 1 : 0);
-
-    }
-}