Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/facade/PlanFacade.java

@@ -169,7 +169,10 @@ public class PlanFacade extends PlanServiceImpl {
         planDetailCancelVO.setPlanId(hospitalPlanCancelVO.getPlanId());
         boolean res = false;
         // 1.先判断数据是否存在有效
-        checkPlan(hospitalPlanCancelVO.getPlanId());
+        Plan plan = checkPlan(hospitalPlanCancelVO.getPlanId());
+        if(plan.getPlanStatus()==1){
+            throw new CommonException(CommonErrorCode.FAIL, "该方案启用中，不能删除！");
+        }
         UpdateWrapper<Plan> planNew = new UpdateWrapper<>();
         planNew
                 .eq("id", hospitalPlanCancelVO.getPlanId())