|
@@ -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()) {
|