急症问题优化，发票打印设置优化

src/main/java/cn/hnthyy/thmz/mapper/his/ChargeFeeVoMapper.java

@@ -923,4 +923,11 @@ public interface ChargeFeeVoMapper {
      */
     @Update("update mz_receipt_serial set pay_id ='99999' where operator_id='99999' and pay_id=''")
     int setPayId();
+
+    /**
+     * 清洗急症记账数据
+     * @return
+     */
+    @Update("update mzy_reqrec set paymode='Y' where  paymode is null and charge_type  in (19,20,21)")
+    int reseshJZReqrecData();
 }

src/main/java/cn/hnthyy/thmz/service/impl/his/ChargeFeeVoServiceImpl.java

@@ -196,6 +196,7 @@ public class ChargeFeeVoServiceImpl implements ChargeFeeVoService {
 
     @Override
     public int refeshPayManData(String userIdCode, Date dcountDate) {
+        chargeFeeVoMapper.reseshJZReqrecData();
         chargeFeeVoMapper.refeshNomalPayManData(userIdCode, dcountDate);
         return chargeFeeVoMapper.refeshRefundNewData(userIdCode, dcountDate);
     }

src/main/resources/static/js/registration.js

@@ -1652,9 +1652,9 @@ function clearRegistration() {
 function prn1Print(patientId, times) {
     setPrint();
     var height ="93.0mm";
-    if(countReceiot%2==0){
-        height ="93.2mm";
-    }
+    // if(countReceiot%2==0){
+    //     height ="93.2mm";
+    // }
     $.ajax({
         type: "GET",
         url: '/thmz/printMzyReqrecRecept?patientId=' + patientId + "&times=" + times,
@@ -1670,7 +1670,7 @@ function prn1Print(patientId, times) {
                 if (res.data == null || res.data.length == 0) {
                     return;
                 }
-                countReceiot++;
+             //   countReceiot++;
                 LODOP = getLodop();
                 var temp = res.data;
                 LODOP.PRINT_INITA(6, 0, "120mm", height, "泰和门诊发票打印");

src/main/resources/static/js/registration_list.js

@@ -2020,9 +2020,9 @@ function clearRegistration() {
 function prn1Print(patientId, times) {
     setPrint();
     var height ="93.0mm";
-    if(countReceiot%2==0){
-        height ="93.2mm";
-    }
+    // if(countReceiot%2==0){
+    //     height ="93.2mm";
+    // }
     $.ajax({
         type: "GET",
         url: '/thmz/printMzyReqrecRecept?patientId=' + patientId + "&times=" + times,
@@ -2038,7 +2038,7 @@ function prn1Print(patientId, times) {
                 if (res.data == null || res.data.length == 0) {
                     return;
                 }
-                countReceiot++;
+            //    countReceiot++;
                 LODOP = getLodop();
                 var temp = res.data;
                 LODOP.PRINT_INITA(6, 0, "120mm", height, "泰和门诊发票打印");

src/main/resources/static/js/toll_administration.js

@@ -1360,9 +1360,9 @@ function obsoleteAndRepPrint(patientId, times, receiptNo) {
 function printCommon(url, patientId, times) {
     setPrint();
     var height = "93.0mm";
-    if (countReceiot % 2 == 0) {
-        height = "93.2mm";
-    }
+    // if (countReceiot % 2 == 0) {
+    //     height = "93.2mm";
+    // }
     $.ajax({
         type: "GET",
         url: url,
@@ -1378,7 +1378,7 @@ function printCommon(url, patientId, times) {
                 if (res.data == null || res.data.length == 0) {
                     return;
                 }
-                countReceiot++;
+               // countReceiot++;
                 for (var i = 0; i < res.data.length; i++) {
                     LODOP = getLodop();
                     var temp = res.data[i].mzReceiptSerial;