Browse Source

优化发票票面

hurugang 5 years ago
parent
commit
1c250be25d

+ 1 - 1
src/main/java/cn/hnthyy/thmz/mapper/his/ChargeFeeVoMapper.java

@@ -607,7 +607,7 @@ public interface ChargeFeeVoMapper {
                     "         rtrim(mzy_reqrec.name) name," +
                     "         mzy_reqrec.req_fee+mzy_reqrec.oth_fee+mzy_reqrec.clinic_fee  as total_charge " +
                     "FROM mzy_reqrec " +
-                    "where cancel_mark <![CDATA[<>]]> '0' " +
+                    "where cancel_mark <![CDATA[<>]]> '0'  and times <![CDATA[>]]> 0 " +
                     "<when test='userIdCode!=null'>",
             " and op_id=#{userIdCode} ",
             "</when>",

+ 1 - 1
src/main/resources/application.yml

@@ -38,4 +38,4 @@ mybatis:
 #打印SQL信息
 logging:
   level:
-    cn.hnthyy.thmz.mapper: info
+    cn.hnthyy.thmz.mapper: debug

+ 1 - 1
src/main/resources/static/js/daily.js

@@ -404,7 +404,7 @@ function getRjbb() {
                     for (var i = 0; i < res.thzffpmx.length; i++) {
                         var receiptBill = res.thzffpmx[i].receiptBill;
                         if (res.thzffpmx[i].receiptBill != null && res.thzffpmx[i].receiptBill.length > 8) {
-                            receiptBill = receiptBill.substring(0, 7);
+                            receiptBill = receiptBill.substring(0, 8);
                         }
                         if (i % 3 == 0) {
                             html += '<tr>';

+ 2 - 2
src/main/resources/static/js/daily_repeat_print.js

@@ -313,7 +313,7 @@ function getRjbb() {
                     for (var i = 0; i < res.sfzffpmx.length; i++) {
                         var receiptBill = res.sfzffpmx[i].receiptBill;
                         if (res.sfzffpmx[i].receiptBill != null && res.sfzffpmx[i].receiptBill.length > 8) {
-                            receiptBill = receiptBill.substring(0, 7);
+                            receiptBill = receiptBill.substring(0, 8);
                         }
                         if (i % 3 == 0) {
                             html += '<tr>';
@@ -411,7 +411,7 @@ function getRjbb() {
                     for (var i = 0; i < res.thzffpmx.length; i++) {
                         var receiptBill = res.thzffpmx[i].receiptBill;
                         if (res.thzffpmx[i].receiptBill != null && res.thzffpmx[i].receiptBill.length > 8) {
-                            receiptBill = receiptBill.substring(0, 7);
+                            receiptBill = receiptBill.substring(0, 8);
                         }
                         if (i % 3 == 0) {
                             html += '<tr>';