diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseAncillaryStrResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseAncillaryStrResVo.java index 3858c14f..05b1d684 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseAncillaryStrResVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseAncillaryStrResVo.java @@ -80,7 +80,7 @@ public class DiseaseAncillaryStrResVo extends DiseaseAncillary { private List diagnosticCriteria; @Schema(description = "诊断依据") - private String diagnosticCriteriaName; + private String diagnosticCriteriaName = ""; /** @@ -90,7 +90,7 @@ public class DiseaseAncillaryStrResVo extends DiseaseAncillary { public void aggregationDiagnosticCriteria() { - if (null == diagnosticCriteria){ + if (null == diagnosticCriteria) { diagnosticCriteria = new ArrayList<>(); } @@ -101,24 +101,40 @@ public class DiseaseAncillaryStrResVo extends DiseaseAncillary { this.diagnosticCriteriaName = "——"; } - if (Integer.valueOf(1).equals(super.getPrimarilyDiagnosisCriteriaFlag())){ + if (Integer.valueOf(1).equals(super.getPrimarilyDiagnosisCriteriaFlag())) { diagnosticCriteria.add(0); - this.diagnosticCriteriaName = "初步诊断依据"; + if (StrUtil.isNotEmpty(diagnosticCriteriaName)) { + this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + "初步诊断依据"; + } else { + this.diagnosticCriteriaName = this.diagnosticCriteriaName + "初步诊断依据"; + } } - if (Integer.valueOf(1).equals(super.getBasisConfirmFlag())){ + if (Integer.valueOf(1).equals(super.getBasisConfirmFlag())) { diagnosticCriteria.add(1); - this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + "证实诊断依据"; + if (StrUtil.isNotEmpty(diagnosticCriteriaName)) { + this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + "证实诊断依据"; + } else { + this.diagnosticCriteriaName = this.diagnosticCriteriaName + "证实诊断依据"; + } } - if (Integer.valueOf(1).equals(super.getBasisIdentificationFlag())){ + if (Integer.valueOf(1).equals(super.getBasisIdentificationFlag())) { diagnosticCriteria.add(2); - this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + "鉴别依据"; + if (StrUtil.isNotEmpty(diagnosticCriteriaName)) { + this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + "鉴别依据"; + } else { + this.diagnosticCriteriaName = this.diagnosticCriteriaName + "鉴别依据"; + } } - if (Integer.valueOf(1).equals(super.getFullCheckFlag())){ + if (Integer.valueOf(1).equals(super.getFullCheckFlag())) { diagnosticCriteria.add(3); - this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + "全面依据"; + if (StrUtil.isNotEmpty(diagnosticCriteriaName)) { + this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + "全面依据"; + } else { + this.diagnosticCriteriaName = this.diagnosticCriteriaName + "全面依据"; + } } } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalStrResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalStrResVo.java index 5e7f1215..e3923fa5 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalStrResVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalStrResVo.java @@ -52,7 +52,7 @@ public class DiseasePhysicalStrResVo extends DiseasePhysical { private String toolType; @Schema(description = "诊断依据") - private String diagnosticCriteriaName; + private String diagnosticCriteriaName = ""; @Schema(description = "是否诊断判读 0否1是") private Integer diagnosisAssessmentFlag; @@ -113,22 +113,38 @@ public class DiseasePhysicalStrResVo extends DiseasePhysical { if (Integer.valueOf(1).equals(super.getPrimarilyDiagnosisCriteriaFlag())) { diagnosticCriteria.add(0); - this.diagnosticCriteriaName = "初步诊断依据"; + if (StrUtil.isNotEmpty(diagnosticCriteriaName)) { + this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + "初步诊断依据"; + } else { + this.diagnosticCriteriaName = this.diagnosticCriteriaName + "初步诊断依据"; + } } if (Integer.valueOf(1).equals(super.getBasisConfirmFlag())) { diagnosticCriteria.add(1); - this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + "证实诊断依据"; + if (StrUtil.isNotEmpty(diagnosticCriteriaName)) { + this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + "证实诊断依据"; + } else { + this.diagnosticCriteriaName = this.diagnosticCriteriaName + "证实诊断依据"; + } } if (Integer.valueOf(1).equals(super.getBasisIdentificationFlag())) { diagnosticCriteria.add(2); - this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + "鉴别依据"; + if (StrUtil.isNotEmpty(diagnosticCriteriaName)) { + this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + "鉴别依据"; + } else { + this.diagnosticCriteriaName = this.diagnosticCriteriaName + "鉴别依据"; + } } if (Integer.valueOf(1).equals(super.getFullCheckFlag())) { diagnosticCriteria.add(3); - this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + "全面依据"; + if (StrUtil.isNotEmpty(diagnosticCriteriaName)) { + this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + "全面依据"; + } else { + this.diagnosticCriteriaName = this.diagnosticCriteriaName + "全面依据"; + } } }