发票中医保金额

src/main/java/cn/hnthyy/thmz/entity/mzdzfp/JSMzInvoiceInfo.java

@@ -64,8 +64,10 @@ public class JSMzInvoiceInfo implements Serializable {
             tradeInfo.setOwn_pay(mzInvoiceInfo.getSetlInfo().getPerSelfPayAmount() == null ? BigDecimal.valueOf(0):mzInvoiceInfo.getSetlInfo().getPerSelfPayAmount());
         }
 
-        tradeInfo.setCash_pay(mzInvoiceInfo.getSetlInfo().getPerCashPayAmount() == null ? BigDecimal.valueOf(0):mzInvoiceInfo.getSetlInfo().getPerCashPayAmount());
-        tradeInfo.setAccount_pay(mzInvoiceInfo.getSetlInfo().getPerAccoPayAmount() == null ? BigDecimal.valueOf(0):mzInvoiceInfo.getSetlInfo().getPerAccoPayAmount());
+//        tradeInfo.setCash_pay(mzInvoiceInfo.getSetlInfo().getPerCashPayAmount() == null ? BigDecimal.valueOf(0):mzInvoiceInfo.getSetlInfo().getPerCashPayAmount());
+//        tradeInfo.setAccount_pay(mzInvoiceInfo.getSetlInfo().getPerAccoPayAmount() == null ? BigDecimal.valueOf(0):mzInvoiceInfo.getSetlInfo().getPerAccoPayAmount());
+        tradeInfo.setCash_pay(BigDecimal.valueOf(0));
+        tradeInfo.setAccount_pay(BigDecimal.valueOf(0));
         tradeInfo.setFund_pay(mzInvoiceInfo.getSetlInfo().getInsureFundPay() == null ? BigDecimal.valueOf(0):mzInvoiceInfo.getSetlInfo().getInsureFundPay());
         hisInfo.setTrade_info(tradeInfo);
 

src/main/java/cn/hnthyy/thmz/service/impl/his/mzdzfp/BswServerImpl.java

@@ -276,7 +276,7 @@ public class BswServerImpl implements BswServer {
             return R.error(resultInfo.getMessage());
         }
 //        mzReceiptSerial.setOperatorId(StrUtil.isNotBlank(uploadParam.getOpId()) ? uploadParam.getOpId() : TokenUtil.getUser().getUserIdCode());
-        return saveMzDzfpUpload(mzReceiptSerial, mzInvoiceInfo, resultInfo, 1);
+        return saveMzDzfpUpload(mzReceiptSerial, mzInvoiceInfo, resultInfo, 1,String.valueOf(mzReceiptSerial.getSerialNo()));
     }
 
 
@@ -409,7 +409,7 @@ public class BswServerImpl implements BswServer {
             return R.error(resultInfo.getMessage());
         }
 //        mzReceiptSerial.setOperatorId(StrUtil.isNotBlank(uploadParam.getOpId()) ? uploadParam.getOpId() : TokenUtil.getUser().getUserIdCode());
-        return saveMzDzfpUpload(mzReceiptSerial, mzInvoiceInfo, resultInfo, 2);
+        return saveMzDzfpUpload(mzReceiptSerial, mzInvoiceInfo, resultInfo, 2,String.valueOf(mzReceiptSerial.getSerialNo()));
     }
 
     /**
@@ -534,7 +534,7 @@ public class BswServerImpl implements BswServer {
         return invoiceDetailList;
     }
 
-    private R saveMzDzfpUpload(MzReceiptSerial mzReceiptSerial, MzInvoiceInfo mzInvoiceInfo, ResultInfo resultInfo, Integer typeFlag) {
+    private R saveMzDzfpUpload(MzReceiptSerial mzReceiptSerial, MzInvoiceInfo mzInvoiceInfo, ResultInfo resultInfo, Integer typeFlag, String serialNo) {
         String resultCode = "";
         String invoiceNumber = "";
         String invoiceCode = "";
@@ -554,7 +554,7 @@ public class BswServerImpl implements BswServer {
                 .patientId(mzReceiptSerial.getPatientId())
                 .times(mzReceiptSerial.getTimes())
                 .receiptNo(mzReceiptSerial.getReceiptNo())
-                .serialNo(String.valueOf(mzReceiptSerial.getSerialNo()))
+                .serialNo(String.valueOf(serialNo))
                 .fpNo(invoiceNumber)
                 .opCode(invoiceCode)
                 .requestId(mzInvoiceInfo.getRequestId())
@@ -893,10 +893,10 @@ public class BswServerImpl implements BswServer {
         if (!ResultInfo.SUCCESS_CODE.equals(resultInfo.getData().get("result"))) {
             return R.error(resultInfo.getMessage());
         }
-        MzReceiptSerial mzReceiptSerial = new MzReceiptSerial(uploadParam.getPatientId(), uploadParam.getTimes(),Integer.parseInt(uploadParam.getSerialNo()));
+        MzReceiptSerial mzReceiptSerial = new MzReceiptSerial(uploadParam.getPatientId(), uploadParam.getTimes());
         mzReceiptSerial.setReceiptNo(uploadParam.getReceiptNo());
 //        mzReceiptSerial.setOperatorId(StrUtil.isNotBlank(uploadParam.getOpId()) ? uploadParam.getOpId() : TokenUtil.getUser().getUserIdCode());
-        return saveMzDzfpUpload(mzReceiptSerial, mzInvoiceInfo, resultInfo, uploadParam.getTypeFlag());
+        return saveMzDzfpUpload(mzReceiptSerial, mzInvoiceInfo, resultInfo, uploadParam.getTypeFlag(),String.valueOf(mzReceiptSerial.getSerialNo()));
     }
 
     private MzInvoiceInfo createZyInvoiceInfo(MzDzfpUpload uploadParam, String requestId) {