From b01202a714fc1c836683cf5fc181c3c16c589f4a Mon Sep 17 00:00:00 2001 From: liu Date: Wed, 3 Jan 2024 10:02:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96:=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=A4=8D=E5=90=88=E7=96=BE=E7=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/medicalrec/MedicalRecManageController.java | 4 ++-- .../com/supervision/manage/pojo/vo/MedicalRecManageVO.java | 2 +- .../manage/service/impl/MedicalRecManageServiceImpl.java | 5 +---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java index 26a32cde..09cda94e 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java @@ -30,7 +30,7 @@ public class MedicalRecManageController { private final MedicalRecManageService medicalRecManageService; - @ApiOperation("初步诊断下拉列表联想(这里目前只查单一疾病)") + @ApiOperation("初步诊断下拉列表联想") @GetMapping("queryDiseaseListByDropList") public List queryDiseaseListByDropList() { return medicalRecManageService.queryDiseaseListByDropList(); @@ -75,7 +75,7 @@ public class MedicalRecManageController { return medicalRecManageService.queryDiseaseTreatmentPlanByCreat(diseaseId); } - @ApiOperation("创建病历时,根据疾病ID查询配置的问题(目前只支持单一疾病)") + @ApiOperation("创建病历时,根据疾病ID查询配置的问题") @GetMapping("queryQuestionListByCreat") public List queryQuestionListByCreat(String diseaseId) { return medicalRecManageService.queryQuestionListByCreat(diseaseId); diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecManageVO.java b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecManageVO.java index 55f24641..1e6ff70a 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecManageVO.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecManageVO.java @@ -20,7 +20,7 @@ public class MedicalRecManageVO extends MedicalRec { private Patient patient; @NotBlank(message = "疾病不能为空") - @ApiModelProperty("step:1 疾病ID(目前只支持单选疾病,且修改时不允许变更)") + @ApiModelProperty("step:1 疾病ID") private String diseaseId; @ApiModelProperty("step:4 应答策略") diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java index 35ae54b5..a92c64e4 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java @@ -55,8 +55,7 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService { private final DiseaseTreatmentPlanManageService diseaseTreatmentPlanManageService; public List queryDiseaseListByDropList() { - // 注意,这里不支持查询复杂疾病,如果需要支持复杂疾病,这里需要单独进行改造 - return diseaseService.lambdaQuery().eq(Disease::getDiseaseType, 0).list(); + return diseaseService.lambdaQuery().list(); } @Override @@ -80,7 +79,6 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService { // 然后保存病历 MedicalRec medicalRec = BeanUtil.toBean(reqVO, MedicalRec.class); medicalRec.setPatientId(patient.getId()); - // 注意,这里新增的时候,目前只支持单个疾病,如果需要多个疾病,需要在这里改造,先新增出来一个疾病 medicalRec.setDiseaseId(reqVO.getDiseaseId()); medicalRec.insert(); // 这里生成一个新的编号(首先去数据库里面查询编号,然后用最大的编号+1)(可能存在并发修改导致编码重复问题,不是重点,等有问题再说) @@ -253,6 +251,5 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService { @Override public void deleteMedicalRec(String id) { medicalRecService.removeById(id); - // 删除病历时,如果是复合疾病,需要将疾病也删除,现在没有做复合疾病,所以先不管 } } From 42a8213ae0ad7aaad9220c6ec35a9054d0d58f1c Mon Sep 17 00:00:00 2001 From: liu Date: Wed, 3 Jan 2024 11:10:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?config=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/{ => config}/AncillaryItemManageController.java | 2 +- .../{ => config}/AskQuestionLibraryManageController.java | 2 +- .../{ => config}/PhysicalLocationManageController.java | 2 +- .../controller/{ => config}/PhysicalToolManageController.java | 2 +- .../controller/{ => config}/TreatmentPlanManageController.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename virtual-patient-manage/src/main/java/com/supervision/manage/controller/{ => config}/AncillaryItemManageController.java (95%) rename virtual-patient-manage/src/main/java/com/supervision/manage/controller/{ => config}/AskQuestionLibraryManageController.java (97%) rename virtual-patient-manage/src/main/java/com/supervision/manage/controller/{ => config}/PhysicalLocationManageController.java (94%) rename virtual-patient-manage/src/main/java/com/supervision/manage/controller/{ => config}/PhysicalToolManageController.java (94%) rename virtual-patient-manage/src/main/java/com/supervision/manage/controller/{ => config}/TreatmentPlanManageController.java (96%) diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/AncillaryItemManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/AncillaryItemManageController.java similarity index 95% rename from virtual-patient-manage/src/main/java/com/supervision/manage/controller/AncillaryItemManageController.java rename to virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/AncillaryItemManageController.java index 61469bf5..3e9a651d 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/AncillaryItemManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/AncillaryItemManageController.java @@ -1,4 +1,4 @@ -package com.supervision.manage.controller; +package com.supervision.manage.controller.config; import com.supervision.manage.service.AncillaryItemManageService; diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/AskQuestionLibraryManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/AskQuestionLibraryManageController.java similarity index 97% rename from virtual-patient-manage/src/main/java/com/supervision/manage/controller/AskQuestionLibraryManageController.java rename to virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/AskQuestionLibraryManageController.java index 721f6157..15ee528f 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/AskQuestionLibraryManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/AskQuestionLibraryManageController.java @@ -1,4 +1,4 @@ -package com.supervision.manage.controller; +package com.supervision.manage.controller.config; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/PhysicalLocationManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/PhysicalLocationManageController.java similarity index 94% rename from virtual-patient-manage/src/main/java/com/supervision/manage/controller/PhysicalLocationManageController.java rename to virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/PhysicalLocationManageController.java index e5dbd066..2f2b6d84 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/PhysicalLocationManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/PhysicalLocationManageController.java @@ -1,4 +1,4 @@ -package com.supervision.manage.controller; +package com.supervision.manage.controller.config; import com.supervision.manage.service.PhysicalLocationManageService; diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/PhysicalToolManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/PhysicalToolManageController.java similarity index 94% rename from virtual-patient-manage/src/main/java/com/supervision/manage/controller/PhysicalToolManageController.java rename to virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/PhysicalToolManageController.java index b5300079..dc835400 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/PhysicalToolManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/PhysicalToolManageController.java @@ -1,4 +1,4 @@ -package com.supervision.manage.controller; +package com.supervision.manage.controller.config; import com.supervision.manage.service.PhysicalToolManageService; import com.supervision.vo.ask.ConfigPhysicalToolResVO; diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/TreatmentPlanManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/TreatmentPlanManageController.java similarity index 96% rename from virtual-patient-manage/src/main/java/com/supervision/manage/controller/TreatmentPlanManageController.java rename to virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/TreatmentPlanManageController.java index 054be949..b44ab41b 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/TreatmentPlanManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/TreatmentPlanManageController.java @@ -1,4 +1,4 @@ -package com.supervision.manage.controller; +package com.supervision.manage.controller.config; import com.supervision.manage.service.ConfigTreatmentPlanManageService; import com.supervision.vo.manage.TreatmentPlanTreeNode;