DESKTOP-0GD05B0\Administrator 2 years ago
parent
commit
56a40d36f1

+ 2 - 1
src/main/java/thyyxxk/webserver/service/PublicServer.java

@@ -506,9 +506,10 @@ public class PublicServer {
         if (StringUtil.isBlank(patNo) || times == null) {
             throw new BizException(ExceptionEnum.LOGICAL_ERROR, "住院号不能为空。");
         }
+        patNo = getInpatientNo(patNo);
         Integer settleType = dao.jieSuanXinXi(patNo, times);
         if (settleType == null) {
-            throw new BizException(ExceptionEnum.LOGICAL_ERROR, "没有查询到患者信息。");
+            throw new BizException(ExceptionEnum.LOGICAL_ERROR, "没有查询到患者结算信息。");
         }
         if (settleType == 1) {
             throw new BizException(ExceptionEnum.LOGICAL_ERROR, "患者已经结算无法进行操作了。");

+ 2 - 2
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/CaoYaoYiZhuService.java

@@ -107,14 +107,14 @@ public class CaoYaoYiZhuService {
         IPage<YzOrderPatternCy> page = new Page<>(currentPage, pageSize, total == 0);
         String name = StringUtil.englishToCapital(queryName);
         QueryWrapper<?> qw = new QueryWrapper<>();
-        qw.and(QueryWrapper -> QueryWrapper
+        qw.and(q -> q
                 .like("py_code", name)
                 .or()
                 .like("d_code", name)
                 .or()
                 .like("pattern_name", name)
         );
-        if (publicServer.noNeedRule(1, 38)) {
+        if (publicServer.noNeedRule(38)) {
             if (StringUtil.notBlank(deptCode)) {
                 qw.eq("dept_code", deptCode);
             }