Explorar o código

中间断账不做大于出院时间费用的判断。

lighter %!s(int64=3) %!d(string=hai) anos
pai
achega
2be0961156

+ 1 - 1
pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>1</version>
+    <version>2</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

+ 7 - 5
src/main/java/thyyxxk/webserver/service/yibao/DismissService.java

@@ -195,13 +195,15 @@ public class DismissService {
                 exception.setMessage("此患者明细费用与账页费用不一致,有【" + beforeAdmFee + "元】小于入院时间的费用。");
                 throw new BizException(exception);
             }
-            BigDecimal afterDisFee = dao.selectOverTimeLimitFee(patNo, times, ledgerSn, ">", tmpendtime);
-            if (afterDisFee.compareTo(BigDecimal.ZERO) != 0) {
-                exception.setMessage("此患者明细费用与账页费用不一致,有【" + afterDisFee + "元】大于出院时间的费用。");
+            if (!param.getMidSetl()) {
+                BigDecimal afterDisFee = dao.selectOverTimeLimitFee(patNo, times, ledgerSn, ">", tmpendtime);
+                if (afterDisFee.compareTo(BigDecimal.ZERO) != 0) {
+                    exception.setMessage("此患者明细费用与账页费用不一致,有【" + afterDisFee + "元】大于出院时间的费用。");
+                    throw new BizException(exception);
+                }
+                exception.setMessage("此患者明细费用与账页费用不一致,请确认所有医嘱、药单等都已接收。");
                 throw new BizException(exception);
             }
-            exception.setMessage("此患者明细费用与账页费用不一致,请确认所有医嘱、药单等都已接收。");
-            throw new BizException(exception);
         }
 
 //        if (!param.getMidSetl()) {