Pārlūkot izejas kodu

默认方案配置删除和停用优化3

wangfeng 3 gadi atpakaļ
vecāks
revīzija
e01fe8205b

+ 2 - 2
cdssman-service/src/main/java/com/diagbot/facade/PlanFacade.java

@@ -202,7 +202,7 @@ public class PlanFacade extends PlanServiceImpl {
         String val = listByGroupType.get(0).getVal();
         String[] valStr = val.split(",");
         List<String> planCode = Arrays.asList(valStr);
-        if(planCode.contains(plan.getPlanCode())){
+        if (plan.getHospitalId() == -1 && planCode.contains(plan.getPlanCode())) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "默认方案编码不能被删除!");
         }
         if (plan.getPlanStatus() == 1) {
@@ -227,7 +227,7 @@ public class PlanFacade extends PlanServiceImpl {
         Plan plan = checkPlan(planRevStopVO.getId());
         List<DictionaryInfoDTO> listByGroupType = dictionaryFacade.getListByGroupType(60);
         List<String> planCode = listByGroupType.stream().map(ac -> ac.getVal()).collect(Collectors.toList());
-        if(planCode.contains(plan.getPlanCode())){
+        if (plan.getHospitalId() == -1 && planCode.contains(plan.getPlanCode())) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "默认方案编码不能被停用!");
         }
         UpdateWrapper<Plan> planNew = new UpdateWrapper<>();