药房固定编码优化

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

@@ -1289,4 +1289,31 @@ function selectYkInfo(groupNo) {
         }
     });
     return ykVo;
+}
+
+// 根据groupNo获取药库药房字典信息
+function getGroupInfo(groupNo) {
+    let ypGroupNoInfo
+    $.ajax({
+        type: "get",
+        url: '/thmz/selectYfYkByGroupNo?groupNo=' + groupNo,
+        contentType: "application/json;charset=UTF-8",
+        dataType: "json",
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        async: false,
+        success: function (res) {
+            if (res === '401' || res === 401) {
+                window.location.href = '/thmz/login/view'
+                return "";
+            }
+            if (res.code === 0) {
+                if(res.data){
+                    ypGroupNoInfo = res.data
+                }
+            } else {
+                errorMesage(res);
+            }
+        }
+    });
+    return ypGroupNoInfo;
 }

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

@@ -17,6 +17,7 @@ var winNo = null;
 var timeInterval;
 var tableInterval;
 var getTableDateInterval;
+let yf
 $(function () {
     clearInterval(timeInterval);
     clearInterval(tableInterval);
@@ -35,15 +36,20 @@ $(function () {
     $(".selectpicker").selectpicker({
         dropuAuto: false
     });
-    var yesNo = '<option value="71">门诊西药房</option>';
+    let no = getLocalStorage("groupNo");
+    if (no == null) {
+        return errorMesageSimaple('药房参数未设置，请在发药参数设置中设置');
+    }
+    yf = selectYfInfo(no)
+    let yesNo = '<option value="' + yf.groupNo + '">' + getGroupName(no) + '</option>';
     $('#fyClass').html(yesNo);
     $('#fyClass').selectpicker('refresh');
-    var winNo = '<option value="01">01</option><option value="02">02</option><option value="03">03</option><option value="04">04</option>';
-    $('#winNo').html(winNo);
+    // 根据药房查询药房发药窗口
+    initDynamicSelectByParam("selectWinNoByGroupNo", "winNo", no, "winNo", "winName");
     $('#winNo').selectpicker('refresh');
     $("#editModal").modal("show");
     //进入页面就加载一次
-    CurentTime();
+    new CurentTime();
     intClock();
     //每秒获取当前时间
     timeInterval = setInterval(CurentTime, 1000);
@@ -155,25 +161,15 @@ function intClock() {
 function initTable() {
     winNo = $("#winNo").val();
     groupNo = $("#fyClass").val();
-    if (groupNo == null || groupNo == "") {
+    if (groupNo == null || groupNo === "") {
         errorMesageSimaple("未选择药房！");
         return;
     }
-    if (winNo == null || winNo == "") {
+    if (winNo == null || winNo === "") {
         errorMesageSimaple("窗口号未录入！");
         return;
     }
-    var yfName = "门诊西药房";
-    if (groupNo == 81) {
-        yfName = "门诊中药房";
-    } else if (groupNo == 82) {
-        yfName = "颗粒剂药房";
-    } else if (groupNo == 91) {
-        yfName = "医材药房";
-    } else if (groupNo == 83) {
-        yfName = "颗粒剂药房2";
-    }
-    $("#yfName").html(yfName);
+    $("#yfName").html(getGroupName(groupNo));
     $("#winNum").text(winNo);
     $("#editModal").modal("hide");
     getTableDate();

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

@@ -13,6 +13,7 @@ var timer="";
 var printTimer = "";
 var timesLong = 5000;
 var hospitalName ='长沙泰和医院'
+let yf
 $(function () {
     getAjaxRequst("/thmz/queryHospitalName",{},true,function (res) {
         hospitalName = res.data
@@ -23,6 +24,7 @@ $(function () {
     if (groupNo == null || windowsNoYf == null) {
         return errorMesageSimaple('药房参数未设置，请在发药参数设置中设置');
     }
+    yf = selectYfInfo(groupNo)
     openSocket("PY");
     initTable();
     $('#dispensingStatusSearch').selectpicker('refresh');
@@ -348,7 +350,7 @@ function initTable() {
  * 查询病人处方明细
  */
 function prescriptionDetail(realNo, orderNo, receiptNo, times, patientId) {
-    let isXy = groupNo === '71' ? true : false;
+    let isXy = yf.yfFlag === '1';
     var temp = {
         groupNo: groupNo,
         realNo: realNo,
@@ -766,10 +768,10 @@ function printView(data) {
         $("#age").attr("value", age);
     }
     var list = data.list;
-    if (age.substring(0, age.indexOf('岁')) < 18 && groupNo === '71') {
+    if (age.substring(0, age.indexOf('岁')) < 18 && yf.xyFlag === '1') {
         $('#drugFlag').attr("value", "儿科");
         printIndex = ekCfPrintIndex;
-    } else if (data.warnDeptName.indexOf("急诊") != -1  && groupNo === '71') {
+    } else if (data.warnDeptName.indexOf("急诊") != -1  && yf.xyFlag === '1') {
         $('#drugFlag').attr("value", "急诊");
         printIndex = jzCfPrintIndex;
     } else {
@@ -796,7 +798,7 @@ function printView(data) {
     if (data.ybCardNo == null || data.ybCardNo == '') {
         $('#ybCardNo').attr("value", data.icCardNo);
     }
-    $('#tbody_yp').html(groupNo === '71' ? getXyPrintHtml(list) : getZyPrintHtml(list));
+    $('#tbody_yp').html(yf.xyFlag === '1' ? getXyPrintHtml(list) : getZyPrintHtml(list));
     LODOP = getLodop();
     LODOP.PRINT_INITA(6, 0, "140mm", "202mm", "泰和医院配药单");
     LODOP.SET_PRINT_STYLE("FontSize", 9); //字体大小
@@ -809,7 +811,7 @@ function printView(data) {
     LODOP.SET_PRINT_MODE("CREATE_CUSTOM_PAGE_NAME", "泰和医院配药单");//对新建的纸张重命名
     let strStyle='';
     let font = 'font-size: 12px;padding: 2px 2px;';
-    if(groupNo !== '71'){
+    if(yf.xyFlag !== '1'){
         strStyle = "<style>table,td,th {border-bottom: 1px dashed black;margin-bottom: 2px;";
         strStyle += font;
         strStyle += "}";
@@ -1081,10 +1083,10 @@ function autoPrintMzCf(chk_value){
 
 // 配药处理
 function dispensingDispose(realNo, orderNo, receiptNo, times, patientId) {
-    if(groupNo !== '71'){
+    if(yf.xyFlag !== '1'){
         errorMesage("暂时仅门诊西药房发药才进行配药处理！");
     }
-    let isXy = groupNo === '71';
+    let isXy = yf.xyFlag === '1';
     let temp = {
         groupNo: groupNo,
         realNo: realNo,

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

@@ -375,7 +375,7 @@ function initTbTable(pageIndex) {
                     var str = "";
                     if (sendRefundGroup == 0) {
                         str = '<button type="button" class="btn btn-primary btn-sm" 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 (yf.xyFlag === '1' || groupNo === '83') {
+                        // if (yf.xyFlag === '1') {
                         //     str += '<button type="button" class="btn btn-primary btn-sm" title="叫号" onclick="callNumber(\'' + row.patientId + '\',\'' + row.name + '\')">叫号 <i class="glyphicon glyphicon-bullhorn"></i></button>';
                         // }
                         if (row.confirmFlag == 5 || row.confirmFlag == 0) {

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

@@ -12,6 +12,7 @@ var tableInterval;
 var lastrow;//最后编辑单元格的行
 var lastcell;//最后编辑单元格的列
 var searchData = {};//搜索条件
+let yf
 $(function () {
     init_daterangepicker();
     $('#reportrange span').html(moment().subtract(5, 'days').format('YYYY-MM-DD') + ' - ' + moment().format('YYYY-MM-DD'));
@@ -25,7 +26,9 @@ $(function () {
     }
     if (groupNo == null) {
         return errorMesageSimaple('当前药房未设置，请在发药参数设置中设置');
-    } else if (groupNo === '81' || groupNo ==='83') {
+    }
+    yf = selectYfInfo(groupNo)
+    if (yf.zyFlag === '1' || yf.klFlag === '1') {
         $('.isXy').css('display', 'none');
         $('.isZy').css('display', '');
         $('#mx').css('display', 'none');
@@ -46,7 +49,7 @@ $(function () {
     clearInterval(tableInterval);
     //五分钟刷新一次请领单列表数据
     tableInterval = setInterval(function (){
-        if((groupNo !== '81' && groupNo !== '83' && $("#submitFlagSearch").val() === "1") || ((groupNo === '81' || groupNo === '83') && $("#submitFlagSearch").val() === "3")){
+        if((yf.zyFlag !== '1' && yf.klFlag !== '1' && $("#submitFlagSearch").val() === "1") || ((yf.zyFlag === '1' || yf.klFlag === '1') && $("#submitFlagSearch").val() === "3")){
             initTbTable()
         }
     }, 50000);
@@ -186,7 +189,7 @@ function initButtonChange(object, realIndex) {
         $("#pageClassSearch").val(searchData.pageClass);
         $("#wardCode").val(searchData.wardCode);
         if (searchData.submitFlag == null) {
-            (groupNo === '81' || groupNo === '83') ?$("#submitFlagSearch").val(3):$("#submitFlagSearch").val(1);
+            (yf.zyFlag === '1' || yf.klFlag === '1') ?$("#submitFlagSearch").val(3):$("#submitFlagSearch").val(1);
         } else {
             $("#submitFlagSearch").val(searchData.submitFlag);
         }
@@ -215,7 +218,7 @@ function initButtonChange(object, realIndex) {
         loadDetailTable();
         let ps = $("#pageClassSearch").val();
         // 不是已发药状态或者是中药房不能手动使用摆药机
-        if("3" !== $("#submitFlagSearch").val() || groupNo === '81' || groupNo === '83'){
+        if("3" !== $("#submitFlagSearch").val() || yf.zyFlag === '1' || yf.klFlag === '1'){
             $("#btn_byj").css('display', 'none');
         } else if("5" === ps || "6" === ps){
             $("#btn_byj").css('display', "inline-flex");
@@ -380,13 +383,13 @@ function initColumns() {
         valign: 'middle',
         formatter: function (value, row, index) {
             var str = '<button type="button" class="registration-no-color-foot-button" title="药单详细" onclick="detail(\'' + row.pageNo + '\',\'' + row.pageClass + '\',\'' + row.wardCode + '\',0)"><i class="fa fa-plus"></i></button>';
-            if ((groupNo !== '81' && groupNo !== '83') && $("#submitFlagSearch").val() === '1' && row.pageClass != 'T' && row.pageClass != 'HT' && row.pageClass != 'A' && row.pageClass != '5' && row.pageClass != '6') {
+            if ((yf.zyFlag !== '1' && yf.klFlag !== '1') && $("#submitFlagSearch").val() === '1' && row.pageClass != 'T' && row.pageClass != 'HT' && row.pageClass != 'A' && row.pageClass != '5' && row.pageClass != '6') {
                 str += '<button type="button" class="registration-no-color-foot-button" title="病室药单汇总" onclick="detail(\'' + row.pageNo + '\',\'' + row.pageClass + '\',\'' + row.wardCode + '\',1)"><i class="fa fa-compress"></i></button>';
             }
-            if (((groupNo !== '81' && groupNo !== '83') && $("#submitFlagSearch").val() === '1') || ((groupNo === '81' || groupNo === '83') && $("#submitFlagSearch").val() === '3'  && row.statusFlag !== 'T')) {
+            if (((yf.zyFlag !== '1' && yf.klFlag !== '1') && $("#submitFlagSearch").val() === '1') || ((yf.zyFlag === '1' || yf.klFlag === '1') && $("#submitFlagSearch").val() === '3'  && row.statusFlag !== 'T')) {
                 str += '<button type="button" class="registration-no-color-foot-button" title="拒绝发药" onclick="cancelSubmit(\'' + row.pageNo + '\',\'' + row.wardName + '\',\'' + row.pageClass + '\')"><i class="fa fa-reply"></i></button>';
             }
-            if((groupNo === '81' || groupNo === '83') && $("#submitFlagSearch").val() === '3' && row.statusFlag === 'T'){
+            if((yf.zyFlag === '1' || yf.klFlag === '1') && $("#submitFlagSearch").val() === '3' && row.statusFlag === 'T'){
                 str += '<button type="button" class="registration-no-color-foot-button" title="拒绝退药" onclick="cancelZcySubmit(\'' + row.pageNo + '\',\'' + row.wardName + '\',\'' + row.pageClass + '\')"><i class="fa fa-close"></i></button>';
             }
             return str;
@@ -559,7 +562,7 @@ function initColumns() {
         align: "center",
         valign: 'middle'
     }];
-    if (groupNo === '81' || groupNo === '83') {
+    if (yf.zyFlag === '1' || yf.klFlag === '1') {
         return base.concat(zy)
     } else {
         return base.concat(xy)
@@ -578,7 +581,7 @@ function loadSummarizingTable() {
         pageClass: pageClass,
         submitFlag: $("#submitFlagSearch").val()
     };
-    if (groupNo === '81' || groupNo === '83') {
+    if (yf.zyFlag === '1' || yf.klFlag === '1') {
         url = '/thmz/getZyDrugCyCount';
         tem = {};
     }
@@ -665,7 +668,7 @@ function initSummarizingTable() {
         rownumWidth: 50,
         rowNum: -1,//取消分页
         caption: '请领单药品汇总',
-        grouping: (!(groupNo === '81' || groupNo === '83')),
+        grouping: (!(yf.zyFlag === '1' || yf.klFlag === '1')),
         groupingView: {
             groupField: ['pageClass'],
             groupSummary: [false],//是否开启汇总页脚
@@ -694,7 +697,7 @@ function initSummarizingTable() {
                 width: 30,
                 editable: true,
                 formatter: "select",
-                hidden: (pageClass === 'T' || groupNo === '81' || groupNo === '83' || pageClass === 'HT'),
+                hidden: (pageClass === 'T' || yf.zyFlag === '1' || yf.klFlag === '1' || pageClass === 'HT'),
                 edittype: "select",
                 editoptions: (pageClass === '3' || pageClass === '4') ? {value: "0:发药;1:暂缓"} : {value: "0:发药;1:暂缓;2:拒发"},
                 formatter: function (cellvalue, options, rowObject) {
@@ -733,11 +736,11 @@ function initSummarizingTable() {
                 index: 'inpatientNo',
                 align: 'center',
                 width: 30,
-                hidden: (!(groupNo === '81' || groupNo === '83'))
+                hidden: (!(yf.zyFlag === '1' || yf.klFlag === '1'))
             },
-            {name: 'bedNo', index: 'bedNo', align: 'center', width: 30, hidden: (!(groupNo === '81' || groupNo === '83'))},
-            {name: 'name', index: 'name', align: 'center', width: 30, hidden: (!(groupNo === '81' || groupNo === '83'))},
-            {name: 'quantityDj', index: 'quantityDj',width: 30, hidden: (!(groupNo === '81' || groupNo === '83')),
+            {name: 'bedNo', index: 'bedNo', align: 'center', width: 30, hidden: (!(yf.zyFlag === '1' || yf.klFlag === '1'))},
+            {name: 'name', index: 'name', align: 'center', width: 30, hidden: (!(yf.zyFlag === '1' || yf.klFlag === '1'))},
+            {name: 'quantityDj', index: 'quantityDj',width: 30, hidden: (!(yf.zyFlag === '1' || yf.klFlag === '1')),
                 formatter: function (cellvalue, options, rowObject) {
                     return cellvalue==0?'':cellvalue
                 }},
@@ -762,14 +765,14 @@ function initSummarizingTable() {
                 index: 'minAmount',
                 align: 'center',
                 width: 30,
-                hidden: (!(groupNo === '81' || groupNo === '83'))
+                hidden: (!(yf.zyFlag === '1' || yf.klFlag === '1'))
             },
             {
                 name: 'amountCount',
                 index: 'amountCount',
                 align: 'center',
                 width: 30,
-                hidden: (!(groupNo === '81' || groupNo === '83')),
+                hidden: (!(yf.zyFlag === '1' || yf.klFlag === '1')),
                 formatter: function (cellvalue, options, rowObject) {
                     return rowObject.amount * rowObject.minAmount
                 }
@@ -797,7 +800,7 @@ function initSummarizingTable() {
                     let money = 0;
                     if(rowObject.retprice === '合计'){
                         money = cellvalue;
-                    } else if (groupNo === '81' || groupNo === '83') {
+                    } else if (yf.zyFlag === '1' || yf.klFlag === '1') {
                         money = keepTwoDecimal(rowObject.retprice * rowObject.amount * rowObject.minAmount);
                     } else {
                         money = keepTwoDecimal(rowObject.retprice * rowObject.amount);
@@ -810,14 +813,14 @@ function initSummarizingTable() {
                 index: 'manufactory',
                 align: 'left',
                 width: 60,
-                hidden: groupNo !== '73'
+                hidden: yf.xyFlag !== '1'
             },
             {
                 name: 'pageClass',
                 index: 'pageClass',
                 align: 'center',
                 width: 40,
-                hidden: groupNo !== '73'
+                hidden: yf.xyFlag !== '1'
             },
             {   name: 'confirmTime',
                 index: 'confirmTime',
@@ -829,7 +832,7 @@ function initSummarizingTable() {
                     }
                     return "";
                 },
-                hidden: groupNo !== '73'
+                hidden: yf.xyFlag !== '1'
             },
             {name: 'serial', index: 'serial', align: 'center', width: 40, hidden: true},
             {
@@ -881,7 +884,7 @@ function initSummarizingTable() {
     });
     $("#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'))) {
+    if (($("#submitFlagSearch").val() === '1' && yf.zyFlag !== '1' && yf.klFlag !== '1') || ($("#submitFlagSearch").val() === '3' && (yf.zyFlag === '1' || yf.klFlag === '1'))) {
         $("#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>");
     } else {
         $("#t_tb_summarizing_table").append("<button class='registration-no-color-foot-button' title='保存批号' id='manu_save_hz' style='color: green;margin-left: 10px;'><i class='fa fa-floppy-o'></i></button>");
@@ -1195,7 +1198,7 @@ function queryParams(params) {
         groupNo: groupNo,
         submitFlag: $("#submitFlagSearch").val()
     };
-    if (groupNo !== '81' && groupNo !== '83') {
+    if (yf.zyFlag !== '1' && yf.klFlag !== '1') {
         temp.pageClass = $("#pageClassSearch").val() == "" ? null : $("#pageClassSearch").val();
     }
     return temp;
@@ -1209,7 +1212,7 @@ function cleanParams() {
     $("#pageNoSearch").val(null);
     $("#pageClassSearch").val(null);
     $("#wardCode").selectpicker('val', '');
-    if (groupNo === '81' || groupNo === '83') {
+    if (yf.zyFlag === '1' || yf.klFlag === '1') {
         $("#submitFlagSearch").val(3);
     } else {
         $("#submitFlagSearch").val(1);
@@ -1285,7 +1288,7 @@ function printXyCount(flag, pageClassText) {
     $("#hzdy_table").append(html);
     let title = (pageClass == "T" || pageClass == "HT") ? '病房退药单' : '病房汇总领药单(' + pageClassText + ')';
     $(".title").text(flag == 0 ? title + "(重打)" : title);
-    $(".groupName").text(groupNo == 71 ? '门诊西药房' : '住院药房');
+    $(".groupName").text(yf.xyFlag === '1' ? '门诊西药房' : '住院药房');
     let w_code = $("#wardCode").find("option:selected").text();
     $(".wardName").text(w_code.substring(0, w_code.lastIndexOf("(")));
     $(".pageNo").text($("#pageNoSearch").val() == '' ? pageNos : $("#pageNoSearch").val());
@@ -1331,7 +1334,7 @@ function printCyCount(flag) {
     $("#trContent").append(html);
     let totalContent;
     let fyfsContent;
-    if(groupNo === '83'){
+    if(yf.klFlag === '1'){
         totalContent = '共 ' + datas[0].amount + ' 剂,' + datas[0].orderJe + ' 元/剂,' +
             '药费总金额：' + keepTwoDecimal(datas[0].orderJe * datas[0].amount) + '元。';
         fyfsContent = '每天 ' + datas[0].cyMtjs + ' 剂,' + datas[0].cyJssm + datas[0].cyJsl + 'ml,' +
@@ -1369,7 +1372,7 @@ function printCountT(flag){
  * @param pageClassText 药单类型
  */
 function printCount(flag, pageClassText) {
-    if (groupNo === '81' || groupNo === '83') {
+    if (yf.zyFlag === '1' || yf.klFlag === '1') {
         printCyCount(flag);
     } else {
         printXyCount(flag, pageClassText);
@@ -1494,7 +1497,7 @@ function printDetailHtml(dataArr, flag) {
         title += '(重打)'
     }
     $(".title").text(title);
-    $(".groupName").text(groupNo == 71 ? '门诊西药房' : '住院药房');
+    $(".groupName").text(yf.xyFlag === '1' ? '门诊西药房' : '住院药房');
     $(".pageNo").text(pageNo);
     $(".printDate").html(format(new Date(), "yyyy-MM-dd HH:mm"));
     $('.sjh').remove();
@@ -1604,7 +1607,7 @@ function printDetailHtml(dataArr, flag) {
  * @param isByj 是否使用摆药机
  */
 function printLabelData(flag, isByj) {
-    if (groupNo === '81' || groupNo === '83') {
+    if (yf.zyFlag === '1' || yf.klFlag === '1') {
         printZyLabelData();
     } else {
         printXyLabelData(flag, isByj);
@@ -1663,9 +1666,9 @@ function printZyLabelData() {
     $('#zydyNameLabel').val(data.name);
     $('#bedNoLabel').val(data.bedNo);
     $('#wardLabel').val(w_code.substring(0, w_code.lastIndexOf("(")));
-    $('#dyslLabel').val(groupNo === '83' ? data.amount : data.amount * 2);
+    $('#dyslLabel').val(yf.klFlag === '1' ? data.amount : data.amount * 2);
     let fyfsContent;
-    if(groupNo === '83'){
+    if(yf.klFlag === '1'){
         fyfsContent = '每天' + data.cyMtjs + '剂,' + data.cyJssm + data.cyJsl + 'ml,' +
             '分' + data.cyFfcs + '次,' + data.fysmContent;
     } else {
@@ -1878,7 +1881,7 @@ function save(flag) {
     if (!confirm("确定要对当前药单进行发药处理吗？")) {
         return;
     }
-    if (groupNo === '81' || groupNo === '83') {
+    if (yf.zyFlag === '1' || yf.klFlag === '1') {
         sendZy();
     } else {
         $("#" + (flag == 0 ? "tb_summarizing_table" : "tb_detail_table")).jqGrid("saveCell", lastrow, lastcell);//当前单元格退出编辑模式
@@ -1942,7 +1945,7 @@ function sendXy(flag) {
                 } else {
                     getPrintDetail(1);
                 }
-                (groupNo === '81' || groupNo === '83') ? $("#submitFlagSearch").val("4"):$("#submitFlagSearch").val("3");
+                (yf.zyFlag === '1' || yf.klFlag === '1') ? $("#submitFlagSearch").val("4"):$("#submitFlagSearch").val("3");
                 $("#submitFlagSearch").selectpicker('refresh');
                 if ('5' === pageClass || ('6' === pageClass && confirm("是否需要打印当前药单的口服标签并使用摆药机？"))) {
                     if (res.data) {
@@ -1974,7 +1977,7 @@ function cancelSubmit(pageNo, wardName, pageClass) {
     if (!confirm("确定要撤销【" + wardName + "】提交的(" + pageNo + ")药单吗？")) {
         return;
     }
-    if (groupNo === '81' || groupNo === '83') {
+    if (yf.zyFlag === '1' || yf.klFlag === '1') {
         cancelZySubmit(pageNo)
     } else {
         cancelXySubmit(pageNo, pageClass)

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

@@ -4,6 +4,7 @@ var pharmacyGroupNo = isEmpty(window.localStorage["groupYk"])?window.localStorag
 var lastrow;//最后编辑单元格的行
 var lastcell;//最后编辑单元格的列
 var hospitalName ='长沙泰和医院'
+let ypGroupInfo
 $(function () {
     getAjaxRequst("/thmz/queryHospitalName",{},true,function (res) {
         hospitalName = res.data
@@ -13,6 +14,7 @@ $(function () {
     if(pharmacyGroupNo == null){
         return errorMesageSimaple('药库或者药房参数未设置，请在发药参数设置中设置');
     }
+    ypGroupInfo = getGroupInfo(pharmacyGroupNo)
     initTbAdd();
     $("#btn_query").click(function (t) {
         loadTbAddRecord();
@@ -166,7 +168,7 @@ function saveTbTable() {
         return;
     }
     let urlStr
-    if("11" === pharmacyGroupNo ){
+    if(ypGroupInfo.yfFlag === '0'){ // 药库
         urlStr = '/thmz/saveYpInventoryYkData';
     } else {
         urlStr = '/thmz/saveYpInventoryData';
@@ -373,7 +375,7 @@ function getTbAddRecordPrintData(drawNo) {
                 return;
             }
             if (res.code == 0) {
-                $("#groupNo").html(pharmacyGroupNo==71?'门诊西药房':'住院药房');
+                $("#groupNo").html(getGroupName(pharmacyGroupNo));
                 $("#inventoryDate").html(format(res.data[0].outDate,'yyyy-MM-dd'));
                 $("#inventoryNo").html(drawNo);
                 $("#auditDate").html(format(res.data[0].confirmDate,'yyyy-MM-dd HH:mm:ss'));