优化提示

src/main/java/thyyxxk/webserver/service/yibao/DismissService.java

@@ -20,6 +20,7 @@ import thyyxxk.webserver.service.externalhttp.SiZySrvc;
 import thyyxxk.webserver.utils.*;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.*;
 
 /**
@@ -147,6 +148,7 @@ public class DismissService {
         }
         List<String> unreceivedDrug = dao.hasUnreceivedDrugList(patNo, times);
         if (ListUtil.notBlank(unreceivedDrug)) {
+
             throw new BizException(ExceptionEnum.LOGICAL_HTML_ERROR, dischargeErrorMessage("此患者有未接收的药单", unreceivedDrug));
         }
         if (dao.hasUnreceivedFees(patNo, times, tmpendtime) > 0) {
@@ -154,7 +156,7 @@ public class DismissService {
             exception.setMessage("此患者有未接收的费用。");
             throw new BizException(exception);
         }
-        if (dao.hasUnSubmitDrugList(patNo, times) > 0) {
+        if (dao.hasUnSubmitDrugList(patNo, times) > 0) { // 有未提交药物清单
             ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
             exception.setMessage("此患者有未提交的药单。");
             throw new BizException(exception);

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

@@ -81,7 +81,7 @@ public class CaoYaoYiZhuServer {
 
     public ResultVo<IPage<YiZhuMingChen>> huoQuCaoYao(String queryName, Integer groupNo, long currentPage, long pageSize, long total) {
         IPage<YiZhuMingChen> page = new Page<>(currentPage, pageSize, total == 0);
-        String name = StringUtil.EnglishToCapital(queryName);
+        String name = StringUtil.englishToCapital(queryName);
         QueryWrapper<?> qw = new QueryWrapper<>();
         qw.and(QueryWrapper -> QueryWrapper
                         .like("py_code", name)
@@ -100,7 +100,7 @@ public class CaoYaoYiZhuServer {
 
     public ResultVo<IPage<YzOrderPatternCy>> huoQuMuBan(String queryName, String deptCode, long currentPage, long pageSize, long total) {
         IPage<YzOrderPatternCy> page = new Page<>(currentPage, pageSize, total == 0);
-        String name = StringUtil.EnglishToCapital(queryName);
+        String name = StringUtil.englishToCapital(queryName);
         QueryWrapper<?> qw = new QueryWrapper<>();
         qw.and(QueryWrapper -> QueryWrapper
                 .like("py_code", name)