From 4eb249c92612406b22591301d47bd6fbcdc19b99 Mon Sep 17 00:00:00 2001
From: longbao <1923439579@qq.com>
Date: Mon, 4 Nov 2024 20:41:43 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=96=BE=E7=97=85=E5=88=86=E7=B1=BB?=
=?UTF-8?q?=E3=80=91=201.=E4=BD=93=E6=A0=BC=E6=A3=80=E6=9F=A5=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E8=AF=8A=E6=96=AD=E4=BE=9D=E6=8D=AE=201.=E8=BE=85?=
=?UTF-8?q?=E5=8A=A9=E6=A3=80=E6=9F=A5=E6=98=BE=E7=A4=BA=E8=AF=8A=E6=96=AD?=
=?UTF-8?q?=E4=BE=9D=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../vo/manage/DiseaseAncillaryStrResVo.java | 55 +++++++++--------
.../vo/manage/DiseasePhysicalStrResVo.java | 61 +++++++++++--------
.../mapper/DiseaseAncillaryMapper.xml | 8 +--
.../mapper/DiseasePhysicalMapper.xml | 8 +--
4 files changed, 72 insertions(+), 60 deletions(-)
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 41c4298e..3858c14f 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
@@ -3,14 +3,17 @@ package com.supervision.vo.manage;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.digest.MD5;
import com.baomidou.mybatisplus.annotation.TableId;
+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
-public class DiseaseAncillaryStrResVo {
+@EqualsAndHashCode(callSuper = true)
+public class DiseaseAncillaryStrResVo extends DiseaseAncillary {
/**
* 主键
@@ -37,18 +40,6 @@ public class DiseaseAncillaryStrResVo {
private String itemType;
- @Schema(description = "初步诊断依据(0否1是)")
- private String primarilyDiagnosisCriteriaFlag;
-
- @Schema(description = "是否是证实诊断依据(0否1是)")
- private String basisConfirmFlag;
-
- @Schema(description = "是否是鉴别依据(0否1是)")
- private String basisIdentificationFlag;
-
- @Schema(description = "全面检查 0否1是")
- private String fullCheckFlag;
-
@Schema(description = "是否诊断判读 0否1是")
private Integer diagnosisAssessmentFlag;
@@ -97,23 +88,37 @@ public class DiseaseAncillaryStrResVo {
* 属性值设置 诊断依据的值
*/
public void aggregationDiagnosticCriteria() {
- if (StrUtil.isBlank(this.primarilyDiagnosisCriteriaFlag)
- && StrUtil.isBlank(this.basisConfirmFlag)
- && StrUtil.isBlank(this.basisIdentificationFlag)
- && StrUtil.isBlank(this.fullCheckFlag)) {
+
+
+ if (null == diagnosticCriteria){
+ diagnosticCriteria = new ArrayList<>();
+ }
+
+ if (StrUtil.isBlank(String.valueOf(super.getPrimarilyDiagnosisCriteriaFlag()))
+ && StrUtil.isBlank(String.valueOf(super.getBasisConfirmFlag()))
+ && StrUtil.isBlank(String.valueOf(super.getBasisIdentificationFlag()))
+ && StrUtil.isBlank(String.valueOf(super.getFullCheckFlag()))) {
this.diagnosticCriteriaName = "——";
}
- if (this.primarilyDiagnosisCriteriaFlag != null) {
- this.diagnosticCriteriaName = getPrimarilyDiagnosisCriteriaFlag();
+
+ if (Integer.valueOf(1).equals(super.getPrimarilyDiagnosisCriteriaFlag())){
+ diagnosticCriteria.add(0);
+ this.diagnosticCriteriaName = "初步诊断依据";
}
- if (this.basisConfirmFlag != null) {
- this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + getBasisConfirmFlag();
+
+ if (Integer.valueOf(1).equals(super.getBasisConfirmFlag())){
+ diagnosticCriteria.add(1);
+ this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + "证实诊断依据";
}
- if (this.basisIdentificationFlag != null) {
- this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + getBasisIdentificationFlag();
+
+ if (Integer.valueOf(1).equals(super.getBasisIdentificationFlag())){
+ diagnosticCriteria.add(2);
+ this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + "鉴别依据";
}
- if (this.fullCheckFlag != null) {
- this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + getFullCheckFlag();
+
+ if (Integer.valueOf(1).equals(super.getFullCheckFlag())){
+ diagnosticCriteria.add(3);
+ 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 718a1014..5e7f1215 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
@@ -3,14 +3,17 @@ package com.supervision.vo.manage;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.digest.MD5;
import com.baomidou.mybatisplus.annotation.TableId;
+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
-public class DiseasePhysicalStrResVo {
+@EqualsAndHashCode(callSuper = true)
+public class DiseasePhysicalStrResVo extends DiseasePhysical {
/**
@@ -48,20 +51,8 @@ public class DiseasePhysicalStrResVo {
@Schema(description = "工具类型")
private String toolType;
- @Schema(description = "初步诊断依据(0否1是)")
- private String primarilyDiagnosisCriteriaFlag;
-
- @Schema(description = "是否是证实诊断依据(0否1是)")
- private String basisConfirmFlag;
-
- @Schema(description = "是否是鉴别依据(0否1是)")
- private String basisIdentificationFlag;
-
- @Schema(description = "全面检查 0正常 1 不正常")
- private String fullCheckFlag;
-
@Schema(description = "诊断依据")
- private String diagnosticCriteria;
+ private String diagnosticCriteriaName;
@Schema(description = "是否诊断判读 0否1是")
private Integer diagnosisAssessmentFlag;
@@ -103,25 +94,41 @@ public class DiseasePhysicalStrResVo {
@Schema(description = "身体部位id路径")
private List<String> locationIdPath;
+ @Schema(description = "诊断依据 0：初步诊断依据 1：证实诊断依据 2：鉴别诊断依据 3：全面诊断依据")
+ private List<Integer> diagnosticCriteria;
+
public void aggregationDiagnosticCriteria() {
- if (StrUtil.isBlank(this.primarilyDiagnosisCriteriaFlag)
- && StrUtil.isBlank(this.basisConfirmFlag)
- && StrUtil.isBlank(this.basisIdentificationFlag)
- && StrUtil.isBlank(this.fullCheckFlag)) {
- this.diagnosticCriteria = "——";
+
+ if (null == diagnosticCriteria) {
+ diagnosticCriteria = new ArrayList<>();
}
- if (this.primarilyDiagnosisCriteriaFlag != null) {
- this.diagnosticCriteria = getPrimarilyDiagnosisCriteriaFlag();
+
+ if (StrUtil.isBlank(String.valueOf(super.getPrimarilyDiagnosisCriteriaFlag()))
+ && StrUtil.isBlank(String.valueOf(super.getBasisConfirmFlag()))
+ && StrUtil.isBlank(String.valueOf(super.getBasisIdentificationFlag()))
+ && StrUtil.isBlank(String.valueOf(super.getFullCheckFlag()))) {
+ this.diagnosticCriteriaName = "——";
+ }
+
+ if (Integer.valueOf(1).equals(super.getPrimarilyDiagnosisCriteriaFlag())) {
+ diagnosticCriteria.add(0);
+ this.diagnosticCriteriaName = "初步诊断依据";
}
- if (this.basisConfirmFlag != null) {
- this.diagnosticCriteria = this.diagnosticCriteria + "-" + getBasisConfirmFlag();
+
+ if (Integer.valueOf(1).equals(super.getBasisConfirmFlag())) {
+ diagnosticCriteria.add(1);
+ this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + "证实诊断依据";
}
- if (this.basisIdentificationFlag != null) {
- this.diagnosticCriteria = this.diagnosticCriteria + "-" + getBasisIdentificationFlag();
+
+ if (Integer.valueOf(1).equals(super.getBasisIdentificationFlag())) {
+ diagnosticCriteria.add(2);
+ this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + "鉴别依据";
}
- if (this.fullCheckFlag != null) {
- this.diagnosticCriteria = this.diagnosticCriteria + "-" + getFullCheckFlag();
+
+ if (Integer.valueOf(1).equals(super.getFullCheckFlag())) {
+ diagnosticCriteria.add(3);
+ this.diagnosticCriteriaName = this.diagnosticCriteriaName + "-" + "全面依据";
}
}
diff --git a/virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml
index ff932875..f406fa40 100644
--- a/virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml
+++ b/virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml
@@ -90,10 +90,10 @@
da.item_id as itemId,
cai.item_name as itemName,
cai.type as itemType,
- case ifnull(da.primarily_diagnosis_criteria_flag,0) when 0 then null when 1 then '初步诊断依据' end as primarilyDiagnosisCriteriaFlag,
- case ifnull(da.basis_confirm_flag,0) when 0 then null when 1 then '证实诊断依据' end as basisConfirmFlag,
- case ifnull(da.basis_identification_flag,0) when 0 then null when 1 then '鉴别依据' end as basisIdentificationFlag,
- case ifnull(da.full_check_flag,0) when 0 then null when 1 then '全面依据' end as fullCheckFlag,
+ da.primarily_diagnosis_criteria_flag as primarilyDiagnosisCriteriaFlag,
+ da.basis_confirm_flag as basisConfirmFlag,
+ da.basis_identification_flag as basisIdentificationFlag,
+ da.full_check_flag as fullCheckFlag,
da.diagnosis_assessment_flag as diagnosisAssessmentFlag,
da.expected_diagnosis_result as expectedDiagnosisResult,
da.require_check_flag as requireCheckFlag,
diff --git a/virtual-patient-model/src/main/resources/mapper/DiseasePhysicalMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiseasePhysicalMapper.xml
index 2fb763f5..27679ca0 100644
--- a/virtual-patient-model/src/main/resources/mapper/DiseasePhysicalMapper.xml
+++ b/virtual-patient-model/src/main/resources/mapper/DiseasePhysicalMapper.xml
@@ -70,10 +70,10 @@
cpl.location_name as locationName,
cpt.tool_name as toolName,
cpt.type as toolType,
- case ifnull(dp.primarily_diagnosis_criteria_flag,0) when 0 then null when 1 then '初步诊断依据' end as primarilyDiagnosisCriteriaFlag,
- case ifnull(dp.basis_confirm_flag,0) when 0 then null when 1 then '证实诊断依据' end as basisConfirmFlag,
- case ifnull(dp.basis_identification_flag,0) when 0 then null when 1 then '鉴别依据' end as basisIdentificationFlag,
- case ifnull(dp.full_check_flag,0) when 0 then null when 1 then '全面依据' end as fullCheckFlag,
+ dp.primarily_diagnosis_criteria_flag as primarilyDiagnosisCriteriaFlag,
+ dp.basis_confirm_flag as basisConfirmFlag,
+ dp.basis_identification_flag as basisIdentificationFlag,
+ dp.full_check_flag as fullCheckFlag,
dp.diagnosis_assessment_flag as diagnosisAssessmentFlag,
dp.location_diagnosis_flag as locationDiagnosisFlag,
dp.expected_diagnosis_result as expectedDiagnosisResult,