Browse Source

门诊发票增加不含门诊统筹标识

hurugang 2 years ago
parent
commit
23ad5862bf

+ 5 - 4
src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzReceiptSerialServiceImpl.java

@@ -9,10 +9,7 @@ import cn.hnthyy.thmz.entity.thmz.Receipt;
 import cn.hnthyy.thmz.entity.thmz.User;
 import cn.hnthyy.thmz.enums.PayMarkEnum;
 import cn.hnthyy.thmz.enums.YesNoEnum;
-import cn.hnthyy.thmz.mapper.his.mz.MzChargeDetailMapper;
-import cn.hnthyy.thmz.mapper.his.mz.MzDepositFileMapper;
-import cn.hnthyy.thmz.mapper.his.mz.MzReceiptSerialMapper;
-import cn.hnthyy.thmz.mapper.his.mz.MzVisitTableMapper;
+import cn.hnthyy.thmz.mapper.his.mz.*;
 import cn.hnthyy.thmz.mapper.thmz.ReceiptMapper;
 import cn.hnthyy.thmz.service.his.mz.*;
 import cn.hnthyy.thmz.service.thmz.UserService;
@@ -45,6 +42,9 @@ public class MzReceiptSerialServiceImpl implements MzReceiptSerialService {
     @SuppressWarnings("all")
     @Autowired
     private MzVisitTableMapper mzVisitTableMapper;
+    @SuppressWarnings("all")
+    @Autowired
+    private MzPatientMiMapper mzPatientMiMapper;
     @Autowired
     private MzSerialNoService mzSerialNoService;
     @Autowired
@@ -347,6 +347,7 @@ public class MzReceiptSerialServiceImpl implements MzReceiptSerialService {
         List<MzReceiptSerialVo> mzReceiptSerialVos = new ArrayList<>();
         MzReceiptSerialVo mzReceiptSerialVo = new MzReceiptSerialVo();
         mzReceiptSerialVo.setMzReceiptSerial(mzReceiptSerial);
+        mzReceiptSerialVo.setCountYbZf(mzPatientMiMapper.countYbZf(mzReceiptSerial.getPatientId(), mzReceiptSerial.getTimes()));
         List<String> feeList = new ArrayList<>();
         if (mzReceiptSerial.getCharge1() != null && mzReceiptSerial.getCharge1().compareTo(BigDecimal.ZERO) == 1) {
             feeList.add("挂号:" + mzReceiptSerial.getCharge1().setScale(2, BigDecimal.ROUND_FLOOR));

+ 2 - 0
src/main/java/cn/hnthyy/thmz/vo/MzReceiptSerialVo.java

@@ -24,4 +24,6 @@ public class MzReceiptSerialVo {
     private List<String> feeList;
     //取药信息   取药药房与窗口号+ ','+ 取药号码
     private List<String> qyxxs;
+    //是否是门诊统筹
+    private Integer countYbZf;
 }

+ 6 - 2
src/main/resources/static/js/mz/toll_administration.js

@@ -1695,8 +1695,12 @@ function printCommon(url, patientId, times, chargeFeeFlag) {
                     }
                     // LODOP.ADD_PRINT_TEXT("54mm","25mm","50mm","3mm","取药窗口:西药房4号窗口");
                     // LODOP.ADD_PRINT_TEXT("54mm","80mm","35mm","3mm","取药号码:408392");
-                    LODOP.ADD_PRINT_TEXT("65mm", "21mm", "60mm", "3mm", temp.totalCharge + " 元");
-                    LODOP.ADD_PRINT_TEXT("72mm", "19mm", "60mm", "3mm", res.data[i].totalChargeStr);
+                    var totalCharge=temp.totalCharge + " 元";
+                    if(res.data[i].countYbZf>0){
+                        totalCharge=totalCharge+"(不含门诊统筹)"
+                    }
+                    LODOP.ADD_PRINT_TEXT("65mm", "21mm", "65mm", "3mm", totalCharge);
+                    LODOP.ADD_PRINT_TEXT("72mm", "19mm", "65mm", "3mm", res.data[i].totalChargeStr);
                     LODOP.ADD_PRINT_TEXT("79mm", "0mm", "15mm", "3mm", res.data[i].year);//年
                     LODOP.ADD_PRINT_TEXT("79mm", "13mm", "10mm", "3mm", res.data[i].month);//月
                     LODOP.ADD_PRINT_TEXT("79mm", "25mm", "10mm", "3mm", res.data[i].day);//日