出纳优化

src/main/java/thyyxxk/webserver/service/inpatient/charge/CashierProcessService.java

@@ -385,8 +385,10 @@ public class CashierProcessService {
         zyReceipt.setSexName(zyActpatient.getSexName());
         zyReceipt.setZyTs(diff == 0 ? 1 : diff + 1);
         ZyLedgerFile zyLedgerFile = list.get(0);
-        if (zyLedgerFile.getCashDate() == null) {
-            throw new BizException(ExceptionEnum.LOGICAL_ERROR, "未出纳处理,不能"+fpVersionStr+"发票");
+        if((NumberEnum.ONE.getCode().equals(fpVersion) && Convert.toInt(param.getTypeFlag(),0) == 3) || NumberEnum.ZERO.getCode().equals(fpVersion)){
+            if (zyLedgerFile.getCashDate() == null) {
+                throw new BizException(ExceptionEnum.LOGICAL_ERROR, "未出纳处理,不能"+fpVersionStr+"发票");
+            }
         }
         zyReceipt.setYbTcZfJe(Convert.toBigDecimal(zyLedgerFile.getFundPaySumamt(), BigDecimal.ZERO).setScale(2, BigDecimal.ROUND_HALF_UP));
         zyReceipt.setGrZhZfJe(Convert.toBigDecimal(zyLedgerFile.getAcctPay(), BigDecimal.ZERO).setScale(2, BigDecimal.ROUND_HALF_UP));