From a479d771e0ab4fe1019b2e1e2a6b7951a8af8415 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Fri, 5 Jan 2024 17:19:43 +0800 Subject: [PATCH] =?UTF-8?q?manage:=20alter=20table=20vp=5Fdisease=5Fancill?= =?UTF-8?q?ary=E6=B7=BB=E5=8A=A0normal=5Fresult=20vp=5Fdisease=5Fphysical?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=20normal=5Fresult?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/service/impl/DiseaseManageServiceImpl.java | 2 -- .../java/com/supervision/model/DiseaseAncillary.java | 10 ++++++++++ .../java/com/supervision/model/DiseasePhysical.java | 5 ++++- .../main/resources/mapper/DiseaseAncillaryMapper.xml | 5 ++++- .../main/resources/mapper/DiseasePhysicalMapper.xml | 4 +++- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseManageServiceImpl.java index 3f7577b8..951e211e 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseManageServiceImpl.java @@ -97,13 +97,11 @@ public class DiseaseManageServiceImpl implements DiseaseManageService { @Override public IPage queryPageList(Integer pageNum, Integer pageSize, DiseaseReqVo diseaseReqVo) { - if (null == diseaseReqVo.getDiseaseType()){ diseaseReqVo.setDiseaseType(0); } IPage page = diseaseService.queryPageList(pageNum, pageSize, diseaseReqVo); - if (page.getSize() == 0) { return page; } diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java index f541db95..498e44ae 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java @@ -60,10 +60,20 @@ public class DiseaseAncillary implements Serializable { /** * 结果 + * 当预期结果为正常：结果值为正常结果； + * 当预期结果为不正常：结果值为不正常结果； */ @ApiModelProperty("结果") private String result; + /** + * 正常结果： + * 只有当预期结果为异常时，才会有值 + */ + + @ApiModelProperty("正常结果") + private String normalResult; + /** * 说明 */ diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java b/virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java index 0afe3b53..de1120d3 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java @@ -68,11 +68,14 @@ public class DiseasePhysical implements Serializable { private Integer locationDiagnosisFlag; /** - * 结果 + * 结果(异常结果) */ @ApiModelProperty("结果") private String result; + @ApiModelProperty("正常结果") + private String normalResult; + /** * 表征 */ diff --git a/virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml index 90b6451e..138feab9 100644 --- a/virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml @@ -17,6 +17,7 @@ + @@ -28,7 +29,7 @@ id ,disease_id,item_id,require_check_flag,basis_confirm_flag,primarily_diagnosis_criteria_flag,basis_identification_flag ,full_check_flag,diagnosis_assessment_flag,expected_diagnosis_result, - result,symptom_image_file_ids,description,create_user_id, + result,normal_result,symptom_image_file_ids,description,create_user_id, create_time,update_user_id,update_time @@ -41,6 +42,7 @@ da.basis_confirm_flag as basisConfirmFlag, da.basis_identification_flag as basisIdentificationFlag, da.result as result, + da.normal_result as normalResult, da.description as description, da.create_time as createTime, da.create_user_id as createUserId, @@ -73,6 +75,7 @@ da.expected_diagnosis_result as expectedDiagnosisResult, da.require_check_flag as requireCheckFlag, da.result as result, + da.normal_result as normalResult, da.description as description from vp_disease_ancillary da left join vp_config_ancillary_item cai on da.item_id = cai.id diff --git a/virtual-patient-model/src/main/resources/mapper/DiseasePhysicalMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiseasePhysicalMapper.xml index 2471467d..e54125da 100644 --- a/virtual-patient-model/src/main/resources/mapper/DiseasePhysicalMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/DiseasePhysicalMapper.xml @@ -18,6 +18,7 @@ + @@ -29,7 +30,7 @@ id,tool_id,location_id,disease_id, require_check_flag,primarily_diagnosis_criteria_flag,basis_confirm_flag, diagnosis_assessment_flag,expected_diagnosis_result,full_check_flag, - basis_identification_flag,result,trait, + basis_identification_flag,result,normal_result,trait, create_user_id,create_time,update_user_id, update_time @@ -52,6 +53,7 @@ dp.expected_diagnosis_result as expectedDiagnosisResult, dp.require_check_flag as requireCheckFlag, dp.result as result, + dp.normal_result as normalResult, dp.trait as trait from vp_disease_physical dp left join vp_config_physical_tool cpt on dp.tool_id = cpt.id