Merge remote-tracking branch 'origin/dev_2.1.0' into dev_2.1.0

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;

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;

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;

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;

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;

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<Disease> queryDiseaseListByDropList() {
         return medicalRecManageService.queryDiseaseListByDropList();
@@ -75,7 +75,7 @@ public class MedicalRecManageController {
         return medicalRecManageService.queryDiseaseTreatmentPlanByCreat(diseaseId);
     }
 
-    @ApiOperation("创建病历时,根据疾病ID查询配置的问题(目前只支持单一疾病)")
+    @ApiOperation("创建病历时,根据疾病ID查询配置的问题")
     @GetMapping("queryQuestionListByCreat")
     public List<MedicalRecQaVO> queryQuestionListByCreat(String diseaseId) {
         return medicalRecManageService.queryQuestionListByCreat(diseaseId);

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 应答策略")

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<Disease> 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);
-        // 删除病历时,如果是复合疾病,需要将疾病也删除,现在没有做复合疾病,所以先不管
     }
 }