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

优化颗粒剂药房相关问题

See merge request lihong/thmz_system!28

src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzPharmacyMapper.java

@@ -665,7 +665,7 @@ public interface MzPharmacyMapper {
             "         a.supply_code," +
             "         a.frequency," +
             "         a.drug_quan," +
-            "         drug_unit=case when a.group_no='81' then c.pack_unit else isnull(a.drug_unit,'') end," +
+            "         drug_unit=case when a.group_no in ('81', '83') then c.pack_unit else isnull(a.drug_unit,'') end," +
             "yp_unit=c.pack_unit," +
             " c.mini_unit," +
             " c.national_code," +

src/main/resources/static/js/common/pharmacy-com.js

@@ -818,6 +818,9 @@ function getGroupName(groupNo) {
         case '91':
             groupName='医材药房';
             break;
+        case '83':
+            groupName='颗粒剂药房2';
+            break;
     }
     return groupName;
 }

src/main/resources/static/js/mz/pharmacy-cell-number.js

@@ -168,8 +168,10 @@ function initTable() {
         yfName = "门诊中药房";
     } else if (groupNo == 82) {
         yfName = "颗粒剂药房";
-    }else if (groupNo == 91) {
+    } else if (groupNo == 91) {
         yfName = "医材药房";
+    } else if (groupNo == 83) {
+        yfName = "颗粒剂药房2";
     }
     $("#yfName").html(yfName);
     $("#winNum").text(winNo);

src/main/resources/static/js/mz/west_pharmacy_dispensing.js

@@ -743,10 +743,10 @@ function printView(data) {
         $("#age").attr("value", age);
     }
     var list = data.list;
-    if (age.substring(0, age.indexOf('岁')) < 18 && groupNo !== '81') {
+    if (age.substring(0, age.indexOf('岁')) < 18 && groupNo === '71') {
         $('#drugFlag').attr("value", "儿科");
         printIndex = ekCfPrintIndex;
-    } else if (data.warnDeptName.indexOf("急诊") != -1  && groupNo !== '81') {
+    } else if (data.warnDeptName.indexOf("急诊") != -1  && groupNo === '71') {
         $('#drugFlag').attr("value", "急诊");
         printIndex = jzCfPrintIndex;
     } else {
@@ -770,7 +770,7 @@ function printView(data) {
     if (data.ybCardNo == null || data.ybCardNo == '') {
         $('#ybCardNo').attr("value", data.icCardNo);
     }
-    $('#tbody_yp').html(groupNo === '81' ? getZyPrintHtml(list) : getXyPrintHtml(list));
+    $('#tbody_yp').html(groupNo === '71' ? getXyPrintHtml(list) : getZyPrintHtml(list));
     LODOP = getLodop();
     LODOP.PRINT_INITA(6, 0, "140mm", "202mm", "泰和医院配药单");
     LODOP.SET_PRINT_STYLE("FontSize", 9); //字体大小
@@ -782,7 +782,7 @@ function printView(data) {
     LODOP.SET_PRINT_MODE("CREATE_CUSTOM_PAGE_NAME", "门诊配药单");//对新建的纸张重命名
     let strStyle='';
     let font = list.length>20?'font-size: 12px;padding: 2px 8px;':'font-size: 14px;padding: 8px;';
-    if(groupNo === '81'){
+    if(groupNo !== '71'){
         strStyle = "<style>table,td,th {border-bottom: 1px dashed black;margin-bottom: 5px;";
         strStyle += font;
         strStyle += "}";

src/main/resources/static/js/mz/west_pharmacy_send.js

@@ -349,8 +349,8 @@ function initTbTable(pageIndex) {
                 formatter: function (value, row, index) {
                     var str = "";
                     if (sendRefundGroup == 0) {
-                        if (groupNo == '71' || groupNo == '81') {
-                            str = '<button type="button" class="registration-no-color-foot-button" title="打印" onclick="printInjectionOralMedicine(\'' + row.patientId + '\',\'' + row.orderNo + '\',\'' + row.realNo + '\',\'' + row.times + '\',\'' + row.receiptNo + '\',\'' + row.confirmFlag + '\');" style="color: #35D082;"><i class="fa fa-print"></i></button>';
+                        str = '<button type="button" class="registration-no-color-foot-button" title="打印" onclick="printInjectionOralMedicine(\'' + row.patientId + '\',\'' + row.orderNo + '\',\'' + row.realNo + '\',\'' + row.times + '\',\'' + row.receiptNo + '\',\'' + row.confirmFlag + '\');" style="color: #35D082;"><i class="fa fa-print"></i></button>';
+                        if (groupNo === '71' || groupNo === '83') {
                             str += '<button type="button" class="registration-no-color-foot-button" title="叫号" onclick="callNumber(\'' + row.patientId + '\',\'' + row.name + '\')"><i class="glyphicon glyphicon-bullhorn"></i></button>';
                         }
                         if (row.confirmFlag == 5 || row.confirmFlag == 0) {
@@ -803,7 +803,7 @@ function sendMedicineProcessingRad() {
  * 打印注射卡口服药品
  */
 function printInjectionOralMedicine(patientId, orderNo, realNo, times, receiptNo, confirmFlag) {
-    if (groupNo !== '81') {
+    if (groupNo === '71') {
         prescriptionDetail(realNo, orderNo, receiptNo, times, patientId, confirmFlag);
     }
     var tem = {
@@ -832,7 +832,7 @@ function printInjectionOralMedicine(patientId, orderNo, realNo, times, receiptNo
             }
             console.log(res);
             if (res.code == 0) {
-                if (groupNo === '81') {
+                if (groupNo !== '71') {
                     zyfdy(res.data);
                 } else {
                     xyfdy(res);