删除限制

src/main/java/thyyxxk/webserver/service/medicalinsurance/SetlListUpldService.java

@@ -1074,13 +1074,7 @@ public class SetlListUpldService {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "结算id为空");
         }
         ZyInactpatient zy = dao.huanZheXinXi(patNo, times);
-        List<Integer> code = publicServer.getRoleCode().getData();
-        if (!code.contains(1) && !code.contains(8) && !code.contains(49) && !code.contains(50)) {
-            TYbSetModifyTime modifyTime = dao.keXiuGaiShiJian();
-            if (!DateUtil.isEffectiveDate(new Date(), modifyTime.getStartTime(), modifyTime.getEndTime())) {
-                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("当前不在医保科设置的修改时间范围内<br>开始时间：【%s】<br>结束时间：【%s】<br>这段结算时间范围内的患者可修改。", DateUtil.formatDatetime(modifyTime.getStartTime(), "yyyy-MM-dd"), DateUtil.formatDatetime(modifyTime.getEndTime(), "yyyy-MM-dd")));
-            }
-        }
+
         if (zy == null) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "未查询到患者信息。");
         }
@@ -1111,7 +1105,6 @@ public class SetlListUpldService {
 
         zy.setPatientBldInfos(dao.shuXueXinXi(patNo, times));
 
-        // todo 在这里要返回患者的分值和科室盈亏
         for (YbZyDisDiag item : zy.getYbZyDisDiag()) {
             item.setSsfz(caseFrontSheetMainService.fetchSsfz(item.getDisDiag().trim(), patNo, times).getData());
         }

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/YiZhuLuRuServer.java

@@ -226,7 +226,7 @@ public class YiZhuLuRuServer {
                 .eq("a.status_flag", "1")
                 .eq("a.enter_oper", TokenUtil.getTokenUserId())
                 // 排除出院带药的医嘱
-                .ne("a.self_buy", "4");
+                .ne("isnull(a.self_buy,'0')", "4");
         param.setList(dao.huoQuYiZhuShuJu(qw));
         List<XinZhenYzActOrder> yiZhuList = param.getList();
         if (ListUtil.isBlank(yiZhuList)) {