Merge branch 'dev-1.1.4' into 'dev-1.1.4'

住院药房药单打印优化

See merge request lihong/thmz_system!53

src/main/resources/static/js/yf/ward_prescription.js

@@ -832,7 +832,7 @@ function initSummarizingTable() {
             }
         }
     });
-    $("#t_tb_summarizing_table").append("<button class='registration-no-color-foot-button' title='打印汇总药单' onclick='printCount(0)' style='margin-left: 10px;'><i class='fa fa-print'></i></button>");
+    $("#t_tb_summarizing_table").append("<button class='registration-no-color-foot-button' title='打印汇总药单' onclick='printCountT(0)' style='margin-left: 10px;'><i class='fa fa-print'></i></button>");
     $("#t_tb_summarizing_table").append("<button class='registration-no-color-foot-button' title='打印口服标签' onclick='printLabelData(0)' style='color: green;margin-left: 10px;'><i class='fa fa-print'></i></button>");
     if (($("#submitFlagSearch").val() === '1' && groupNo !== '81' && groupNo !== '83') || ($("#submitFlagSearch").val() === '3' && (groupNo === '81' || groupNo === '83'))) {
         $("#t_tb_summarizing_table").append("<button class='registration-no-color-foot-button' title='保存药单' id='collect_save' onclick='save(0)' style='color: green;margin-left: 10px;'><i class='fa fa-floppy-o'></i></button>");
@@ -1181,10 +1181,14 @@ function cleanParams() {
 /**
  * 打印西药汇总单
  */
-function printXyCount(flag) {
+function printXyCount(flag, pageClassText) {
+    if(isEmpty(pageClassText)){
+        errorMesageSimaple("药单类型为空，请重新打印药单！");
+        return;
+    }
     let html = '';
     let totalMoney = 0;
-    $('.sjh').remove();
+    $('.sjhHz').remove();
     let datas = getJQAllData("tb_summarizing_table");
     let summaryData = [];
     for (var i = 0; i < datas.length; i++) {
@@ -1204,7 +1208,7 @@ function printXyCount(flag) {
                 handle = '拒退'
             }
         }
-        html += '<tr class="sjh">';
+        html += '<tr class="sjhHz">';
         html += '<td class="xtd" style="text-align: center;">' + handle + '</td>';
         html += '<td class="xtd" style="text-align: center;">' + data.chargeCode + '</td>';
         html += '<td class="xtd" style="text-align: center;">' + data.location + '</td>';
@@ -1218,24 +1222,18 @@ function printXyCount(flag) {
         totalMoney += parseFloat(data.totalMoney);
         summaryInfo = {chargeCode:'', serial: '',amount:0, printPageNo:'', printPageClass:''};
     }
-    html += '<tr class="sjh">';
+    html += '<tr class="sjhHz">';
     html += '<td colspan="8" style="text-align: right;font-weight: 700;">总计：' + keepTwoDecimal(parseFloat(totalMoney)) + '</td>';
     html += '<td colspan="1"></td>';
     html += '</tr>';
-    html += '<tr class="sjh"><td colspan="9" style="border: transparent !important;">&nbsp</td></tr>';
-    html += '<tr class="sjh">';
+    html += '<tr class="sjhHz"><td colspan="9" style="border: transparent !important;">&nbsp</td></tr>';
+    html += '<tr class="sjhHz">';
     html += '<td colspan="3" style="text-align: left;font-weight: 700;border: transparent !important;">调配人：</td>';
     html += '<td colspan="3" style="text-align: left;font-weight: 700;border: transparent !important;">核发人：</td>';
     html += '<td colspan="3" style="text-align: left;font-weight: 700;border: transparent !important;">领药人：</td>';
     html += '</tr>';
     $("#hzdy_table").append(html);
-    let $pageClassSearch = $('#pageClassSearch');
-    let pageClassSearch = $pageClassSearch.find("option:selected").text();
-    if(isEmpty(pageClassSearch)){
-        errorMesageSimaple("打印表头参数为空，请联系管理员");
-        return;
-    }
-    let title = (pageClass == "T" || pageClass == "HT") ? '病房退药单' : '病房汇总领药单(' + pageClassSearch + ')';
+    let title = (pageClass == "T" || pageClass == "HT") ? '病房退药单' : '病房汇总领药单(' + pageClassText + ')';
     $(".title").text(flag == 0 ? title + "(重打)" : title);
     $(".groupName").text(groupNo == 71 ? '门诊西药房' : '住院药房');
     let w_code = $("#wardCode").find("option:selected").text();
@@ -1300,15 +1298,22 @@ function printCyCount(flag) {
     print("zydy_table_div");
 }
 
+// 手动打印汇总药单
+function printCountT(flag){
+    let pageClassText = $("#pageClassSearch").find("option:selected").text();
+    printCount(flag, pageClassText);
+}
+
 /**
  * 打印汇总单
  * @param flag 0:手动打印 1：保存后自动打印
+ * @param pageClassText 药单类型
  */
-function printCount(flag) {
+function printCount(flag, pageClassText) {
     if (groupNo === '81' || groupNo === '83') {
         printCyCount(flag);
     } else {
-        printXyCount(flag);
+        printXyCount(flag, pageClassText);
     }
 }
 
@@ -1867,7 +1872,8 @@ function sendXy(flag) {
             if (res.code == 0) {
                 successMesage(res);
                 if (flag == 0) {
-                    printCount(1);
+                    let pageClassText = $("#pageClassSearch").find("option:selected").text();
+                    printCount(1, pageClassText);
                 } else {
                     getPrintDetail(1);
                 }