Procházet zdrojové kódy

颗粒剂处方打印优化以及住院发药修改

hsh před 1 rokem
rodič
revize
91d2dca4f8

+ 1 - 1
src/main/java/cn/hnthyy/thmz/controller/yf/YfWardPrescriptionController.java

@@ -91,7 +91,7 @@ public class YfWardPrescriptionController {
                 resultMap.put("message", "病房请领单列表查询参数不能为空");
                 return resultMap;
             }
-            if(yzYpPageNoVo.getGroupNo().equals("81")){
+            if(yzYpPageNoVo.getGroupNo().equals("81") || yzYpPageNoVo.getGroupNo().equals("83")){
                 YzActOrderCyVo yzActOrderCyVo = new YzActOrderCyVo();
                 yzActOrderCyVo.setBeginDate(yzYpPageNoVo.getSubmitBeginDate());
                 yzActOrderCyVo.setEndDate(yzYpPageNoVo.getSubmitEndDate());

+ 4 - 4
src/main/java/cn/hnthyy/thmz/service/impl/his/yf/YfWardPrescriptionServiceImpl.java

@@ -711,7 +711,7 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
             }
             ypZyPatient.setSupplyCode(supplyCode);
             ypZyPatient.setAmount(quantity);
-            ypZyPatient.setInfantFlag(yzActOrderCy.getInpatientNo().indexOf("$") == -1 ? "0" : "1");
+            ypZyPatient.setInfantFlag(!yzActOrderCy.getInpatientNo().contains("$") ? "0" : "1");
             ypZyPatient.setDrawer(yzActOrderCy.getDoctorCode());
             ypZyPatient.setKeeper(userCode);
             ypZyPatient.setAlwaysFlag("t").setDrugClass("j").setAcctSign("2").setSelfFlag("1").setPaySelf("0").setPageType("Z")
@@ -731,7 +731,7 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
                 zyDetailChargeNew.setDetailSn(maxDetailSn + 1);
                 zyDetailChargeNew.setGenTime(now).setChargeDate(now).setChargeCode("BILL02").setChargeStatus("2").setSelfFlag("0").setOpeFlag("0").setTransFlagYb("0");
                 zyDetailChargeNew.setOpIdCode(yzActOrderCy.getDoctorCode()).setDoctorCode(yzActOrderCy.getDoctorCode());
-                zyDetailChargeNew.setInfantFlag(yzActOrderCy.getInpatientNo().indexOf("$") == -1 ? "0" : "1");
+                zyDetailChargeNew.setInfantFlag(!yzActOrderCy.getInpatientNo().contains("$") ? "0" : "1");
                 zyDetailChargeNew.setChargeAmount(yzActOrderCyDetail.getQuantity()*yzActOrderCy.getQuantity());
                 zyDetailChargeNew.setChargeFee(BigDecimal.valueOf(yzActOrderCyDetail.getQuantity()*yzActOrderCyDetail.getUnitPrice()*yzActOrderCy.getQuantity()));
                 zyDetailChargeNew.setOrderNo(yzActOrderCy.getOrderNo());
@@ -752,7 +752,7 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
                     djf.setDetailSn(maxDetailSn + 1);
                     djf.setGenTime(now).setChargeDate(now).setChargeCode(yzActOrderCy.getOrderCodeDj()).setChargeStatus("2").setSelfFlag("0").setOpeFlag("0").setTransFlagYb("0");
                     djf.setOpIdCode(yzActOrderCy.getDoctorCode()).setDoctorCode(yzActOrderCy.getDoctorCode());
-                    djf.setInfantFlag(yzActOrderCy.getInpatientNo().indexOf("$") == -1 ? "0" : "1");
+                    djf.setInfantFlag(!yzActOrderCy.getInpatientNo().contains("$") ? "0" : "1");
                     djf.setChargeAmount(yzActOrderCy.getQuantityDj());
                     djf.setChargeFee(BigDecimal.valueOf(yzActOrderCy.getQuantityDj()).multiply(yzActOrderCy.getOrderJeDj()));
                     djf.setOrderNo(yzActOrderCy.getOrderNo());
@@ -917,7 +917,7 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
                 yfWardVo.setInstruction(yzActOrder.getInstruction());
                 yfWardVo.setSupplyName(yzSupplyTypeMapper.selectSupplyNameByCode(yzActOrder.getSupplyCode()));
                 //毒麻药单,长期口服,临时口服,统领单
-                if (pageClass.equals("2") || pageClass.equals("5") || pageClass.equals("6") || pageClass.equals("7")) {
+                if (pageClass.equals("1") || pageClass.equals("2") || pageClass.equals("5") || pageClass.equals("6") || pageClass.equals("7")) {
                     yfWardVo.setFrequCode(yzActOrder.getFrequCode());
                     yfWardVo.setDose(yzActOrder.getDose());
                     yfWardVo.setDoseUnit(mzPharmacyMapper.selectYpUnitName(yzActOrder.getDoseUnit()));

+ 26 - 26
src/main/resources/static/js/mz/west_pharmacy_dispensing.js

@@ -781,9 +781,9 @@ function printView(data) {
     LODOP.SET_SHOW_MODE("BKIMG_HEIGHT", "202mm");
     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;';
+    let font = 'font-size: 12px;padding: 2px 2px;';
     if(groupNo !== '71'){
-        strStyle = "<style>table,td,th {border-bottom: 1px dashed black;margin-bottom: 5px;";
+        strStyle = "<style>table,td,th {border-bottom: 1px dashed black;margin-bottom: 2px;";
         strStyle += font;
         strStyle += "}";
         strStyle += "</style>";
@@ -914,42 +914,42 @@ function getXyPrintHtml(list) {
         var number = i + 1;
         let manufactoryName = list[i].manufactoryName == null || list[i].manufactoryName == '' ? '' : '(' + list[i].manufactoryName + ')';
         tr += '<tr>' +
-            '    <td style="margin-bottom: 5px;width: 10px;font-size: 14px;" align="left" valign="top">' + number + "." +
+            '    <td style="margin-bottom: 5px;width: 10px;font-size: 12px;" align="left" valign="top">' + number + "." +
             '</td>' +
-            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">' + tryResult + list[i].drugName +
+            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 12px;">' + tryResult + list[i].drugName +
             '    </td>' +
-            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 70px;text-align: right;font-size: 14px;">' + list[i].specification +
+            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 70px;text-align: right;font-size: 12px;">' + list[i].specification +
             '</td>' +
-            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 5px;text-align: left;font-size: 14px;">×</td>' +
-            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 5px;text-align: left;font-size: 14px;">' + list[i].quantity +
+            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 5px;text-align: left;font-size: 12px;">×</td>' +
+            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 5px;text-align: left;font-size: 12px;">' + list[i].quantity +
             '</td>' +
-            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 25px;text-align: left;font-size: 14px;">' + list[i].ypUnitName +
+            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 25px;text-align: left;font-size: 12px;">' + list[i].ypUnitName +
             '</td>' +
             '</tr>' +
             '<tr>' +
-            '    <td style="margin-bottom: 5px;width: 10px;font-size: 14px;" align="left" valign="top">' +
+            '    <td style="margin-bottom: 5px;width: 10px;font-size: 12px;" align="left" valign="top">' +
             '</td>' +
-            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">' + manufactoryName + tryFlag +
+            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 12px;">' + manufactoryName + tryFlag +
             '    </td>' +
-            '    <td colspan="4" style="padding-left:0px;margin-bottom: 5px;width:220px;vertical-align: middle !important;text-align: left;font-size: 14px;">用法:' + list[i].drugQuan + "&nbsp;" + list[i].drugUnitName + '/次&nbsp;&nbsp;' + list[i].frequencyName + '&nbsp;&nbsp;' + printName +
+            '    <td colspan="4" style="padding-left:0px;margin-bottom: 5px;width:220px;vertical-align: middle !important;text-align: left;font-size: 12px;">用法:' + list[i].drugQuan + "&nbsp;" + list[i].drugUnitName + '/次&nbsp;&nbsp;' + list[i].frequencyName + '&nbsp;&nbsp;' + printName +
             '</td>' +
             '</tr>' +
             '<tr>' +
-            '    <td style="margin-bottom: 5px;width: 10px;font-size: 14px;" align="left" valign="top">' +
+            '    <td style="margin-bottom: 5px;width: 10px;font-size: 12px;" align="left" valign="top">' +
             '</td>' +
-            '    <td colspan="5" style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">' + (list[i].instructionText == null ? '' : list[i].instructionText) +
+            '    <td colspan="5" style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 12px;">' + (list[i].instructionText == null ? '' : list[i].instructionText) +
             '    </td>' +
             '</tr>' +
             '<tr>' +
-            '    <td style="margin-bottom: 5px;width: 10px;font-size: 14px;" align="left" valign="top">' +
+            '    <td style="margin-bottom: 5px;width: 10px;font-size: 12px;" align="left" valign="top">' +
             '</td>' +
-            '    <td colspan="5" style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">' + '货位号:' + list[i].location +
+            '    <td colspan="5" style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 12px;">' + '货位号:' + list[i].location +
             '    </td>' +
             '</tr><tr style="height: 5px;"><td><img src="about:blank" width="5" height="5" /></td></tr>';
     }
     $('#yxwk').remove();
-    if (list.length < 5) {
-        $('#div_yp').append('<span id="yxwk" style="margin-bottom: 5px;font-size: 14px;">以下为空</span>');
+    if (list.length <= 5) {
+        $('#div_yp').append('<span id="yxwk" style="margin-bottom: 5px;font-size: 12px;">以下为空</span>');
     }
     return tr;
 }
@@ -963,18 +963,18 @@ function getZyPrintHtml(list) {
     let tr = '';
     for (let i = 0; i < list.length;) {
         tr += '<tr class="sjh">' +
-            '<td style="width: 100px;">' + list[i].drugName +
+            '<td style="width: 160px; font-size: 12px;">' + list[i].drugName +
             '</td>' +
-            '<td style="width: 40px;text-align: right;">' + list[i].specification +
+            '<td style="width: 40px;text-align: right; font-size: 12px;">' + list[i].specification +
             '</td>' +
-            '<td style="width: 35px;text-align: right;border-right: 1px solid black;">' + list[i].quantity + list[i].ypUnitName +
+            '<td style="width: 25px;text-align: right;border-right: 1px solid black; font-size: 12px;">' + list[i].quantity + list[i].ypUnitName +
             '</td>';
         if (i + 1 < list.length) {
-            tr += '<td style="width: 100px;">' + list[i + 1].drugName +
+            tr += '<td style="width: 160px; font-size: 12px;">' + list[i + 1].drugName +
                 '</td>' +
-                '<td style="width: 40px;text-align: right;">' + list[i + 1].specification +
+                '<td style="width: 40px;text-align: right; font-size: 12px;">' + list[i + 1].specification +
                 '</td>' +
-                '<td style="width: 35px;text-align: right;">' + list[i + 1].quantity + list[i + 1].ypUnitName +
+                '<td style="width: 25px;text-align: right; font-size: 12px;">' + list[i + 1].quantity + list[i + 1].ypUnitName +
                 '</td>' +
                 '</tr>';
         }
@@ -982,7 +982,7 @@ function getZyPrintHtml(list) {
     }
     let cydj = isEmpty(list[0].cyDj)?'':list[0].cyDj;
     tr += '<tr class="sjh">' +
-        '<td colspan="6" style="border: 0px !important;text-align: right;padding: 0px;">×&nbsp;' + list[0].drugWin +
+        '<td colspan="6" style="border: 0 !important;text-align: right;padding: 0;">×&nbsp;' + list[0].drugWin +
         '&nbsp;副&nbsp;&nbsp;'+cydj+'</td>' +
         '</tr>';
     let yf = '';
@@ -990,10 +990,10 @@ function getZyPrintHtml(list) {
     yf += isEmpty(list[0].cyJsl)?'':list[0].cyJssm+list[0].cyJsl+'ml,';
     yf += isEmpty(list[0].cyZql)?'':'煮取量'+list[0].cyZql+'ml,';
     yf += isEmpty(list[0].cyFj)?'':'复煎'+list[0].cyFj+'次。';
-    yf += isEmpty(list[0].cyFfcs)?'':'分'+list[0].cyFfcs+'次,<br/>';
+    yf += isEmpty(list[0].cyFfcs)?'':'分'+list[0].cyFfcs+'次,';
     yf += isEmpty(list[0].cyFysm)?'':list[0].cyFysm;
     tr += '<tr class="sjh">' +
-        '<td colspan="6" style="border: 0px !important;text-align: left;padding: 0px;">'+yf+'</td>' +
+        '<td colspan="6" style="border: 0 !important;text-align: left;padding: 0; font-size: 12px;">'+yf+'</td>' +
         '</tr>';
     return tr;
 }

+ 52 - 34
src/main/resources/static/js/yf/ward_prescription.js

@@ -25,7 +25,7 @@ $(function () {
     }
     if (groupNo == null) {
         return errorMesageSimaple('当前药房未设置,请在发药参数设置中设置');
-    } else if (groupNo === '81') {
+    } else if (groupNo === '81' || groupNo ==='83') {
         $('.isXy').css('display', 'none');
         $('.isZy').css('display', '');
         $('#mx').css('display', 'none');
@@ -45,7 +45,7 @@ $(function () {
     clearInterval(tableInterval);
     //五分钟刷新一次请领单列表数据
     tableInterval = setInterval(function (){
-        if((groupNo !== '81' && $("#submitFlagSearch").val() === "1") || (groupNo === '81' && $("#submitFlagSearch").val() === "3")){
+        if((groupNo !== '81' && groupNo !== '83' && $("#submitFlagSearch").val() === "1") || ((groupNo === '81' || groupNo === '83') && $("#submitFlagSearch").val() === "3")){
             initTbTable()
         }
     }, 50000);
@@ -185,7 +185,7 @@ function initButtonChange(object, realIndex) {
         $("#pageClassSearch").val(searchData.pageClass);
         $("#wardCode").val(searchData.wardCode);
         if (searchData.submitFlag == null) {
-            groupNo === '81' ?$("#submitFlagSearch").val(3):$("#submitFlagSearch").val(1);
+            (groupNo === '81' || groupNo === '83') ?$("#submitFlagSearch").val(3):$("#submitFlagSearch").val(1);
         } else {
             $("#submitFlagSearch").val(searchData.submitFlag);
         }
@@ -214,7 +214,7 @@ function initButtonChange(object, realIndex) {
         loadDetailTable();
         let ps = $("#pageClassSearch").val();
         // 不是已发药状态或者是中药房不能手动使用摆药机
-        if("3" != $("#submitFlagSearch").val() || groupNo === '81'){
+        if("3" !== $("#submitFlagSearch").val() || groupNo === '81' || groupNo === '83'){
             $("#btn_byj").css('display', 'none');
         } else if("5" === ps || "6" === ps){
             $("#btn_byj").css('display', "inline-flex");
@@ -382,11 +382,11 @@ 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' && $("#submitFlagSearch").val() === '1' && row.pageClass != 'T' && row.pageClass != 'HT' && row.pageClass != 'A' && row.pageClass != '5' && row.pageClass != '6') {
+            if ((groupNo !== '81' && groupNo !== '83') && $("#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' && $("#submitFlagSearch").val() === '1') || (groupNo === '81' && $("#submitFlagSearch").val() === '3')) {
-                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() === '1') || ((groupNo === '81' || groupNo === '83') && $("#submitFlagSearch").val() === '3')) {
+                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>';
             }
             return str;
         }
@@ -514,7 +514,7 @@ function initColumns() {
         align: "center",
         valign: 'middle'
     }];
-    if (groupNo === '81') {
+    if (groupNo === '81' || groupNo === '83') {
         return base.concat(zy)
     } else {
         return base.concat(xy)
@@ -533,7 +533,7 @@ function loadSummarizingTable() {
         pageClass: pageClass,
         submitFlag: $("#submitFlagSearch").val()
     };
-    if (groupNo === '81') {
+    if (groupNo === '81' || groupNo === '83') {
         url = '/thmz/getZyDrugCyCount';
         tem = {};
     }
@@ -619,7 +619,7 @@ function initSummarizingTable() {
         rownumWidth: 50,
         rowNum: -1,//取消分页
         caption: '请领单药品汇总',
-        grouping: groupNo === '81' ? false : true,
+        grouping: (!(groupNo === '81' || groupNo === '83')),
         groupingView: {
             groupField: ['pageClass'],
             groupSummary: [false],//是否开启汇总页脚
@@ -648,7 +648,7 @@ function initSummarizingTable() {
                 width: 30,
                 editable: true,
                 formatter: "select",
-                hidden: (pageClass === 'T' || groupNo === '81' || pageClass === 'HT') ? true : false,
+                hidden: (pageClass === 'T' || groupNo === '81' || groupNo === '83' || pageClass === 'HT'),
                 edittype: "select",
                 editoptions: (pageClass === '3' || pageClass === '4') ? {value: "0:发药;1:暂缓"} : {value: "0:发药;1:暂缓;2:拒发"},
                 formatter: function (cellvalue, options, rowObject) {
@@ -687,11 +687,11 @@ function initSummarizingTable() {
                 index: 'inpatientNo',
                 align: 'center',
                 width: 30,
-                hidden: groupNo === '81' ? false : true
+                hidden: (!(groupNo === '81' || groupNo === '83'))
             },
-            {name: 'bedNo', index: 'bedNo', align: 'center', width: 30, hidden: groupNo === '81' ? false : true},
-            {name: 'name', index: 'name', align: 'center', width: 30, hidden: groupNo === '81' ? false : true},
-            {name: 'quantityDj', index: 'quantityDj',width: 30, hidden: groupNo === '81' ? false : true,
+            {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')),
                 formatter: function (cellvalue, options, rowObject) {
                     return cellvalue==0?'':cellvalue
                 }},
@@ -715,14 +715,14 @@ function initSummarizingTable() {
                 index: 'minAmount',
                 align: 'center',
                 width: 30,
-                hidden: groupNo === '81' ? false : true
+                hidden: (!(groupNo === '81' || groupNo === '83'))
             },
             {
                 name: 'amountCount',
                 index: 'amountCount',
                 align: 'center',
                 width: 30,
-                hidden: groupNo === '81' ? false : true,
+                hidden: (!(groupNo === '81' || groupNo === '83')),
                 formatter: function (cellvalue, options, rowObject) {
                     return rowObject.amount * rowObject.minAmount
                 }
@@ -750,7 +750,7 @@ function initSummarizingTable() {
                     let money = 0;
                     if(rowObject.retprice === '合计'){
                         money = cellvalue;
-                    } else if (groupNo === '81') {
+                    } else if (groupNo === '81' || groupNo === '83') {
                         money = keepTwoDecimal(rowObject.retprice * rowObject.amount * rowObject.minAmount);
                     } else {
                         money = keepTwoDecimal(rowObject.retprice * rowObject.amount);
@@ -763,14 +763,14 @@ function initSummarizingTable() {
                 index: 'manufactory',
                 align: 'left',
                 width: 60,
-                hidden: groupNo === '81' ? true : false
+                hidden: (!(groupNo === '81' || groupNo === '83'))
             },
             {
                 name: 'pageClass',
                 index: 'pageClass',
                 align: 'center',
                 width: 40,
-                hidden: groupNo === '81' ? true : false
+                hidden: (!(groupNo === '81' || groupNo === '83'))
             },
             {   name: 'confirmTime',
                 index: 'confirmTime',
@@ -782,7 +782,7 @@ function initSummarizingTable() {
                     }
                     return "";
                 },
-                hidden: groupNo === '81' ? true : false
+                hidden: (!(groupNo === '81' || groupNo === '83'))
             },
             {name: 'serial', index: 'serial', align: 'center', width: 40, hidden: true},
             {
@@ -834,7 +834,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='printLabelData(0)' style='color: green;margin-left: 10px;'><i class='fa fa-print'></i></button>");
-    if (($("#submitFlagSearch").val() === '1' && groupNo !== '81') || ($("#submitFlagSearch").val() === '3' && groupNo === '81')) {
+    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>");
     } 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>");
@@ -1147,7 +1147,7 @@ function queryParams(params) {
         groupNo: groupNo,
         submitFlag: $("#submitFlagSearch").val()
     };
-    if (groupNo !== '81') {
+    if (groupNo !== '81' && groupNo !== '83') {
         temp.pageClass = $("#pageClassSearch").val() == "" ? null : $("#pageClassSearch").val();
     }
     return temp;
@@ -1161,7 +1161,7 @@ function cleanParams() {
     $("#pageNoSearch").val(null);
     $("#pageClassSearch").val(null);
     $("#wardCode").selectpicker('val', '');
-    if (groupNo === '81') {
+    if (groupNo === '81' || groupNo === '83') {
         $("#submitFlagSearch").val(3);
     } else {
         $("#submitFlagSearch").val(1);
@@ -1269,10 +1269,19 @@ function printCyCount(flag) {
         i += 2;
     }
     $("#trContent").append(html);
-    let totalContent = '共 ' + datas[0].amount + ' 剂,' + datas[0].orderJe + ' 元/剂,院内代煎 ' + datas[0].quantityDj + ' 剂,' +
-        '药费总金额:' + keepTwoDecimal(datas[0].orderJe * datas[0].amount) + ',代煎费:' + datas[0].quantityDj * datas[0].orderJeDj + '。';
-    let fyfsContent = '每天 ' + datas[0].cyMtjs + ' 剂,' + datas[0].cyJssm + datas[0].cyJsl + 'ml,煮取' + datas[0].cyZql + 'ml,复煎 ' + datas[0].cyFj + ' 次,' +
-        '分 ' + datas[0].cyFfcs + ' 次,' + datas[0].fysmContent + '。';
+    let totalContent;
+    let fyfsContent;
+    if(groupNo === '83'){
+        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,' +
+            '分 ' + datas[0].cyFfcs + ' 次,' + datas[0].fysmContent + '。';
+    } else {
+        totalContent = '共 ' + datas[0].amount + ' 剂,' + datas[0].orderJe + ' 元/剂,院内代煎 ' + datas[0].quantityDj + ' 剂,' +
+            '药费总金额:' + keepTwoDecimal(datas[0].orderJe * datas[0].amount) + '元,代煎费:' + datas[0].quantityDj * datas[0].orderJeDj + '元。';
+        fyfsContent = '每天 ' + datas[0].cyMtjs + ' 剂,' + datas[0].cyJssm + datas[0].cyJsl + 'ml,煮取' + datas[0].cyZql + 'ml,复煎 ' + datas[0].cyFj + ' 次,' +
+            '分 ' + datas[0].cyFfcs + ' 次,' + datas[0].fysmContent + '。';
+    }
     $(".total").text(totalContent);
     $(".fyfs").text(fyfsContent);
     $(".doctorName").text(datas[0].doctorName);
@@ -1284,7 +1293,7 @@ function printCyCount(flag) {
  * @param flag 0:手动打印 1:保存后自动打印
  */
 function printCount(flag) {
-    if (groupNo === '81') {
+    if (groupNo === '81' || groupNo === '83') {
         printCyCount(flag);
     } else {
         printXyCount(flag);
@@ -1519,7 +1528,7 @@ function printDetailHtml(dataArr, flag) {
  * @param isByj 是否使用摆药机
  */
 function printLabelData(flag, isByj) {
-    if (groupNo === '81') {
+    if (groupNo === '81' || groupNo === '83') {
         printZyLabelData();
     } else {
         printXyLabelData(flag, isByj);
@@ -1578,7 +1587,16 @@ function printZyLabelData() {
     $('#zydyNameLabel').val(data.name);
     $('#bedNoLabel').val(data.bedNo);
     $('#wardLabel').val(w_code.substring(0, w_code.lastIndexOf("(")));
-    $('#dyslLabel').val(data.amount * 2);
+    $('#dyslLabel').val(groupNo === '83' ? data.amount : data.amount * 2);
+    let fyfsContent;
+    if(groupNo === '83'){
+        fyfsContent = '每天' + data.cyMtjs + '剂,' + data.cyJssm + data.cyJsl + 'ml,' +
+            '分' + data.cyFfcs + '次,' + data.fysmContent;
+    } else {
+        fyfsContent = '每天' + data.cyMtjs + '剂,' + data.cyJssm + data.cyJsl + 'ml,煮取' + data.cyZql + 'ml,复煎' + data.cyFj
+            + '次,' + '分' + data.cyFfcs + '次,' + data.fysmContent;
+    }
+    $('#yfLabel').val(fyfsContent);
     $('#dateLabel').val(format(new Date(), "MM-dd"));
     $('#zydybqModal').modal();
 }
@@ -1766,7 +1784,7 @@ function save(flag) {
     if (!confirm("确定要对当前药单进行发药处理吗?")) {
         return;
     }
-    if (groupNo === '81') {
+    if (groupNo === '81' || groupNo === '83') {
         sendZy();
     } else {
         $("#" + (flag == 0 ? "tb_summarizing_table" : "tb_detail_table")).jqGrid("saveCell", lastrow, lastcell);//当前单元格退出编辑模式
@@ -1829,7 +1847,7 @@ function sendXy(flag) {
                 } else {
                     getPrintDetail(1);
                 }
-                groupNo === '81'?$("#submitFlagSearch").val("4"):$("#submitFlagSearch").val("3");
+                (groupNo === '81' || groupNo === '83') ? $("#submitFlagSearch").val("4"):$("#submitFlagSearch").val("3");
                 $("#submitFlagSearch").selectpicker('refresh');
                 if ('5' === pageClass || ('6' === pageClass && confirm("是否需要打印当前药单的口服标签并使用摆药机?"))) {
                     if (res.data) {
@@ -1861,7 +1879,7 @@ function cancelSubmit(pageNo, wardName, pageClass) {
     if (!confirm("确定要撤销【" + wardName + "】提交的(" + pageNo + ")药单吗?")) {
         return;
     }
-    if (groupNo === '81') {
+    if (groupNo === '81' || groupNo === '83') {
         cancelZySubmit(pageNo)
     } else {
         cancelXySubmit(pageNo, pageClass)

+ 30 - 44
src/main/resources/templates/mz/west_pharmacy_dispensing.html

@@ -105,48 +105,44 @@
                             <br/>
                             <input style="border: 0px;width: 80px;margin-left: 380px;font-size: 17px;font-weight: bold;background-color: white;color: black;" disabled value="" id="drugFlag"/>
                             <br/>
-                            <span style="font-size: 14px;">医疗/医保卡号:</span>
-                            <input style="border: 0px;width: 150px;background-color: white;color: black;font-size: 14px;" disabled value="" id="ybCardNo"/>
-                            <span style="margin-left: 10px;font-size: 14px;">处方号:</span>
-                            <input style="border: 0px;width: 120px;background-color: white;color: black;font-size: 14px;" disabled value="" id="realNo"/>
+                            <span style="font-size: 12px;">医疗/医保卡号:</span>
+                            <input style="border: 0px;width: 150px;background-color: white;color: black;font-size: 12px;" disabled value="" id="ybCardNo"/>
+                            <span style="margin-left: 10px;font-size: 12px;">处方号:</span>
+                            <input style="border: 0px;width: 120px;background-color: white;color: black;font-size: 12px;" disabled value="" id="realNo"/>
                             <div style="border:1px solid black;width: 470px;"></div>
-                            <span style="font-size: 14px;margin-bottom: 5px;">姓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名:</span>
-                            <input style="margin-bottom: 5px;font-size: 14px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 75px;background-color: white;color: black;"
+                            <span style="font-size: 12px;margin-bottom: 5px;">姓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名:</span>
+                            <input style="margin-bottom: 5px;font-size: 12px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 70px;background-color: white;color: black;"
                                    disabled value="" id="name"/>
-                            <span style="margin-bottom: 5px;margin-left: 20px;font-size: 14px;">性别:</span>
-                            <input style="margin-bottom: 5px;font-size: 14px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 40px;background-color: white;color: black;"
+                            <span style="margin-bottom: 5px;margin-left: 20px;font-size: 12px;">性别:</span>
+                            <input style="margin-bottom: 5px;font-size: 12px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 35px;background-color: white;color: black;"
                                    disabled value="" id="sex"/>
-                            <span style="margin-bottom: 5px;margin-left: 20px;font-size: 14px;">年龄:</span>
-                            <input style="margin-bottom: 5px;font-size: 14px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 55px;background-color: white;color: black;"
+                            <span style="margin-bottom: 5px;margin-left: 20px;font-size: 12px;">年龄:</span>
+                            <input style="margin-bottom: 5px;font-size: 12px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 70px;background-color: white;color: black;"
                                    disabled value="" id="age"/>
-                            <span style="margin-bottom: 5px;margin-left: 20px;font-size: 14px;">体重(KG):</span>
-                            <input style="margin-bottom: 5px;font-size: 14px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 28px;background-color: white;color: black;"
+                            <span style="margin-bottom: 5px;margin-left: 20px;font-size: 12px;">体重(KG):</span>
+                            <input style="margin-bottom: 5px;font-size: 12px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 28px;background-color: white;color: black;"
                                    disabled value=""/>
                             <br/>
-                            <span style="margin-bottom: 5px;font-size: 14px;">病&nbsp;&nbsp;历&nbsp;&nbsp;号:</span>
-                            <input style="margin-bottom: 5px;font-size: 14px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 150px;background-color: white;color: black;"
+                            <span style="margin-bottom: 5px;font-size: 12px;">病&nbsp;&nbsp;历&nbsp;&nbsp;号:</span>
+                            <input style="margin-bottom: 5px;font-size: 12px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 150px;background-color: white;color: black;"
                                    disabled value="" id="patientId"/>
-                            <span style="margin-bottom: 5px;margin-left: 50px;font-size: 14px;">科&nbsp;&nbsp;&nbsp;&nbsp;别:</span>
-                            <input style="margin-bottom: 5px;font-size: 14px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 154px;background-color: white;color: black;"
+                            <span style="margin-bottom: 5px;margin-left: 50px;font-size: 12px;">科&nbsp;&nbsp;&nbsp;&nbsp;别:</span>
+                            <input style="margin-bottom: 5px;font-size: 12px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 154px;background-color: white;color: black;"
                                    disabled value="" id="warnDeptName"/>
                             <br/>
-                            <span style="margin-bottom: 5px;font-size: 14px;">身份证号:</span>
-                            <input style="margin-bottom: 5px;font-size: 14px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 150px;background-color: white;color: black;"
+                            <span style="margin-bottom: 5px;font-size: 12px;">身份证号:</span>
+                            <input style="margin-bottom: 5px;font-size: 12px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 150px;background-color: white;color: black;"
                                    disabled value="" id="socialNo"/>
-                            <span style="margin-bottom: 5px;margin-left: 50px;font-size: 14px;">手机号:</span>
-                            <input style="margin-bottom: 5px;font-size: 14px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 152px;background-color: white;color: black;"
+                            <span style="margin-bottom: 5px;margin-left: 50px;font-size: 12px;">手机号:</span>
+                            <input style="margin-bottom: 5px;font-size: 12px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 152px;background-color: white;color: black;"
                                    disabled value="" id="phoneNo"/>
                             <br/>
-                            <span style="margin-bottom: 5px;font-size: 14px;">临床诊断:</span>
-                            <input style="margin-bottom: 5px;font-size: 14px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 412px;background-color: white;color: black;"
+                            <span style="margin-bottom: 5px;font-size: 12px;">临床诊断:</span>
+                            <input style="margin-bottom: 5px;font-size: 12px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 242px;background-color: white;color: black;"
                                    disabled value="" id="icdText"/>
-                            <br/>
-                            <span style="margin-bottom: 5px;font-size: 14px;">地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址:</span>
-                            <input style="margin-bottom: 5px;font-size: 14px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 250px;background-color: white;color: black;"
-                                   disabled value="" id="address"/>
-                            <span style="margin-bottom: 5px;margin-left: 5px;font-size: 14px;">日期:</span>
-                            <input style="margin-bottom: 5px;font-size: 14px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 117px;background-color: white;color: black;" disabled value="" id="priceTime"/><br/>
-                            <span style="font-weight: bold;font-size: 25px;">Rp</span>
+                            <span style="margin-bottom: 5px;margin-left: 5px;font-size: 12px;">日期:</span>
+                            <input style="margin-bottom: 5px;font-size: 12px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 117px;background-color: white;color: black;" disabled value="" id="priceTime"/><br/>
+                            <span style="font-weight: bold;font-size: 20px;">Rp</span>
                         </form>
                     </div>
                     <div id="div_yp">
@@ -155,23 +151,13 @@
                             </tbody>
                         </table>
                     </div>
-                    <div id="zbr_div" style="position: absolute;top:635px; ">
-                        <div style="margin-bottom: 5px;margin-top: 10px;"><span style="font-size: 14px;">医师(签章):</span>
-                            <input style="font-size: 14px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 190px;background-color: white;color: black;"
+                    <div id="zbr_div" style="position: absolute;top:685px; ">
+                        <div style="margin-bottom: 5px;margin-top: 10px;"><span style="font-size: 12px;">医师(签章):</span>
+                            <input style="font-size: 12px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 190px;background-color: white;color: black;"
                                    disabled value="" id="employeeName"/>
-                            <span style="margin-bottom: 5px;margin-left: 50px;font-size: 14px;">药品金额:</span>
-                            <input style="margin-bottom: 5px;font-size: 14px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 70px;background-color: white;color: black;"
+                            <span style="margin-bottom: 5px;margin-left: 50px;font-size: 12px;">药品金额:</span>
+                            <input style="margin-bottom: 5px;font-size: 12px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 70px;background-color: white;color: black;"
                                    disabled value="" id="totalPrice"/>
-                            <br/>
-                            <span style="margin-bottom: 5px;font-size: 14px;">审核药师:</span>
-                            <input style="margin-bottom: 5px;font-size: 14px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 55px;background-color: white;color: black;"
-                                   disabled value=""/>
-                            <span style="margin-bottom: 5px;margin-left: 25px;font-size: 14px;">调配药师/士:</span>
-                            <input style="margin-bottom: 5px;font-size: 14px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 55px;background-color: white;color: black;"
-                                   disabled value=""/>
-                            <span style="margin-bottom: 5px;margin-left: 27px;font-size: 14px;">核对、发药药师:</span>
-                            <input style="margin-bottom: 5px;font-size: 14px;border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 55px;background-color: white;color: black;"
-                                   disabled value=""/>
                         </div>
                     </div>
                 </div>

+ 2 - 2
src/main/resources/templates/yf/ward_prescription.html

@@ -483,7 +483,7 @@
                                 <label class="control-label col-md-2 col-sm-2 col-xs-12" for="yfLabel">用法:
                                 </label>
                                 <div class="col-md-9 col-sm-9 col-xs-12">
-                                    <input id="yfLabel" class="form-control optional" type="text">
+                                    <input id="yfLabel" class="form-control optional" style="font-size: 12px;" type="text">
                                 </div>
                             </div>
                             <div class="form-group">
@@ -496,7 +496,7 @@
                                         <option value="1">外用</option>
                                     </select>
                                 </div>
-                                <label class="control-label col-md-3 col-sm-3 col-xs-12" for="yfLabel">打印张数:
+                                <label class="control-label col-md-3 col-sm-3 col-xs-12" for="dyslLabel">打印张数:
                                 </label>
                                 <div class="col-md-3 col-sm-3 col-xs-12">
                                     <input id="dyslLabel" class="form-control optional" type="number">