【疾病分类】

1.体格检查显示诊断依据
1.辅助检查显示诊断依据
jinan_uat_by_release_3.0.0
longbao 6 months ago
parent 1c3bd26af4
commit 63d538a7df

@ -3,14 +3,17 @@ package com.supervision.vo.manage;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.digest.MD5; import cn.hutool.crypto.digest.MD5;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.supervision.model.DiseaseAncillary;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@Data @Data
public class DiseaseAncillaryStrResVo { @EqualsAndHashCode(callSuper = true)
public class DiseaseAncillaryStrResVo extends DiseaseAncillary {
/** /**
* *
@ -37,18 +40,6 @@ public class DiseaseAncillaryStrResVo {
private String itemType; 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是") @Schema(description = "是否诊断判读 0否1是")
private Integer diagnosisAssessmentFlag; private Integer diagnosisAssessmentFlag;
@ -97,23 +88,37 @@ public class DiseaseAncillaryStrResVo {
* *
*/ */
public void aggregationDiagnosticCriteria() { public void aggregationDiagnosticCriteria() {
if (StrUtil.isBlank(this.primarilyDiagnosisCriteriaFlag)
&& StrUtil.isBlank(this.basisConfirmFlag)
&& StrUtil.isBlank(this.basisIdentificationFlag) if (null == diagnosticCriteria){
&& StrUtil.isBlank(this.fullCheckFlag)) { 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 = "——"; 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 + "-" + "全面依据";
} }
} }

@ -3,14 +3,17 @@ package com.supervision.vo.manage;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.digest.MD5; import cn.hutool.crypto.digest.MD5;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.supervision.model.DiseasePhysical;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@Data @Data
public class DiseasePhysicalStrResVo { @EqualsAndHashCode(callSuper = true)
public class DiseasePhysicalStrResVo extends DiseasePhysical {
/** /**
@ -48,20 +51,8 @@ public class DiseasePhysicalStrResVo {
@Schema(description = "工具类型") @Schema(description = "工具类型")
private String toolType; 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 = "诊断依据") @Schema(description = "诊断依据")
private String diagnosticCriteria; private String diagnosticCriteriaName;
@Schema(description = "是否诊断判读 0否1是") @Schema(description = "是否诊断判读 0否1是")
private Integer diagnosisAssessmentFlag; private Integer diagnosisAssessmentFlag;
@ -103,25 +94,41 @@ public class DiseasePhysicalStrResVo {
@Schema(description = "身体部位id路径") @Schema(description = "身体部位id路径")
private List<String> locationIdPath; private List<String> locationIdPath;
@Schema(description = "诊断依据 0初步诊断依据 1证实诊断依据 2鉴别诊断依据 3全面诊断依据")
private List<Integer> diagnosticCriteria;
public void aggregationDiagnosticCriteria() { public void aggregationDiagnosticCriteria() {
if (StrUtil.isBlank(this.primarilyDiagnosisCriteriaFlag)
&& StrUtil.isBlank(this.basisConfirmFlag) if (null == diagnosticCriteria) {
&& StrUtil.isBlank(this.basisIdentificationFlag) diagnosticCriteria = new ArrayList<>();
&& StrUtil.isBlank(this.fullCheckFlag)) {
this.diagnosticCriteria = "——";
} }
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 + "-" + "全面依据";
} }
} }

@ -90,10 +90,10 @@
da.item_id as itemId, da.item_id as itemId,
cai.item_name as itemName, cai.item_name as itemName,
cai.type as itemType, cai.type as itemType,
case ifnull(da.primarily_diagnosis_criteria_flag,0) when 0 then null when 1 then '初步诊断依据' end as primarilyDiagnosisCriteriaFlag, da.primarily_diagnosis_criteria_flag as primarilyDiagnosisCriteriaFlag,
case ifnull(da.basis_confirm_flag,0) when 0 then null when 1 then '证实诊断依据' end as basisConfirmFlag, da.basis_confirm_flag as basisConfirmFlag,
case ifnull(da.basis_identification_flag,0) when 0 then null when 1 then '鉴别依据' end as basisIdentificationFlag, da.basis_identification_flag as basisIdentificationFlag,
case ifnull(da.full_check_flag,0) when 0 then null when 1 then '全面依据' end as fullCheckFlag, da.full_check_flag as fullCheckFlag,
da.diagnosis_assessment_flag as diagnosisAssessmentFlag, da.diagnosis_assessment_flag as diagnosisAssessmentFlag,
da.expected_diagnosis_result as expectedDiagnosisResult, da.expected_diagnosis_result as expectedDiagnosisResult,
da.require_check_flag as requireCheckFlag, da.require_check_flag as requireCheckFlag,

@ -70,10 +70,10 @@
cpl.location_name as locationName, cpl.location_name as locationName,
cpt.tool_name as toolName, cpt.tool_name as toolName,
cpt.type as toolType, cpt.type as toolType,
case ifnull(dp.primarily_diagnosis_criteria_flag,0) when 0 then null when 1 then '初步诊断依据' end as primarilyDiagnosisCriteriaFlag, dp.primarily_diagnosis_criteria_flag as primarilyDiagnosisCriteriaFlag,
case ifnull(dp.basis_confirm_flag,0) when 0 then null when 1 then '证实诊断依据' end as basisConfirmFlag, dp.basis_confirm_flag as basisConfirmFlag,
case ifnull(dp.basis_identification_flag,0) when 0 then null when 1 then '鉴别依据' end as basisIdentificationFlag, dp.basis_identification_flag as basisIdentificationFlag,
case ifnull(dp.full_check_flag,0) when 0 then null when 1 then '全面依据' end as fullCheckFlag, dp.full_check_flag as fullCheckFlag,
dp.diagnosis_assessment_flag as diagnosisAssessmentFlag, dp.diagnosis_assessment_flag as diagnosisAssessmentFlag,
dp.location_diagnosis_flag as locationDiagnosisFlag, dp.location_diagnosis_flag as locationDiagnosisFlag,
dp.expected_diagnosis_result as expectedDiagnosisResult, dp.expected_diagnosis_result as expectedDiagnosisResult,

Loading…
Cancel
Save