diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/constant/DisposalPlanEnum.java b/virtual-patient-manage/src/main/java/com/supervision/manage/constant/DisposalPlanEnum.java index 9646000a..6db62866 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/constant/DisposalPlanEnum.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/constant/DisposalPlanEnum.java @@ -20,8 +20,8 @@ public enum DisposalPlanEnum { CLINIC_VISIT("9", "会诊"), FOLLOW_VISIT("10", "随诊"); - private String code; - private String name; + private final String code; + private final String name; DisposalPlanEnum(String code, String name) { this.code = code; diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseTreatmentPlanManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseTreatmentPlanManageController.java index 9e36b519..aedadbc8 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseTreatmentPlanManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseTreatmentPlanManageController.java @@ -1,9 +1,8 @@ package com.supervision.manage.controller.diseasemanage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import cn.hutool.core.collection.CollUtil; import com.supervision.manage.service.DiseaseTreatmentPlanManageService; -import com.supervision.model.ConfigTreatmentPlan; import com.supervision.model.DiseaseTreatmentPlan; import com.supervision.vo.manage.*; import io.swagger.annotations.Api; @@ -47,7 +46,11 @@ public class DiseaseTreatmentPlanManageController { List<DiseaseTreatmentPlanResVo> diseaseTreatmentPlanResVos = diseaseTreatmentPlanManageService.queryListByDiseaseId(diseaseId); // 前端大哥强烈要求把treatmentPlanId 转换为 firstMeasuresId - diseaseTreatmentPlanResVos.forEach(vo -> vo.setFirstMeasuresId(vo.getTreatmentPlanId())); + diseaseTreatmentPlanResVos.forEach(vo -> { + if (CollUtil.isEmpty(vo.getDrugIds())) { + vo.setFirstMeasuresId(vo.getTreatmentPlanId()); + } + }); return diseaseTreatmentPlanResVos; diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java index 65aae26b..d00f634e 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java @@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Pair; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.supervision.manage.service.ConfigTreatmentPlanManageService; import com.supervision.manage.service.DiseaseTreatmentPlanManageService; import com.supervision.model.CommonDic; @@ -102,6 +101,11 @@ public class DiseaseTreatmentPlanManageServiceImpl implements DiseaseTreatmentPl assertDiseaseTreatmentPlan(diseaseTreatmentPlan); + // note: 如果diseaseTreatmentPlan.getDiseaseId()不为空,则表示处置计划为药品,需要进行手动矫正,统一设置为20 + if (CollUtil.isNotEmpty(diseaseTreatmentPlan.getDrugIds())){ + diseaseTreatmentPlan.setTreatmentPlanId("20"); + } + diseaseTreatmentPlanService.save(diseaseTreatmentPlan); // 保存处置计划药品信息