优化操作和打印显示

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

@@ -84,6 +84,17 @@ function initTable() {
         },
         columns: [
             {
+                title: '操作',
+                field: 'op',
+                align: "center",
+                valign: 'middle',
+                formatter: function (value, row, index) {
+                    var str = '<button type="button" class="registration-no-color-foot-button" title="打印" onclick="printPrescription(\'' + row.patientId + '\',\'' + row.times+ '\',\'' + row.orderNo + '\')"  style="color: #35D082;"><i class="fa fa-print"></i></button>';
+                    str += '<button type="button" class="registration-no-color-foot-button" title="配药完成" onclick="dispensingDispose(\'' + row.patientId + '\',\'' + row.orderNo + '\',\'' + row.times + '\')"><i class="fa fa-check-square-o"></i></button>';
+                    str += '<button type="button" class="registration-no-color-foot-button" title="详细" onclick="prescriptionDetail(\'' + row.realNo + '\',\'' + 71 + '\',\'' + row.orderNo + '\',\'' + row.receiptNo + '\',\'' + row.times + '\',\'' + row.patientId + '\')"><i class="fa fa-plus"></i></button>';
+                    return str;
+                }
+            }, {
                 field: 'no',
                 title: '序号',
                 align: "center",
@@ -120,17 +131,6 @@ function initTable() {
                 formatter: function (value, row, index) {
                     return value == null ? "-" : format(value, "yyyy-MM-dd HH:mm:ss");
                 }
-            }, {
-                title: '操作',
-                field: 'op',
-                align: "center",
-                valign: 'middle',
-                formatter: function (value, row, index) {
-                    var str = '<button type="button" class="registration-no-color-foot-button" title="打印" onclick="printPrescription(\'' + row.patientId + '\',\'' + row.times+ '\',\'' + row.orderNo + '\')"  style="color: #35D082;"><i class="fa fa-print"></i></button>';
-                    str += '<button type="button" class="registration-no-color-foot-button" title="配药完成" onclick="dispensingDispose(\'' + row.patientId + '\',\'' + row.orderNo + '\',\'' + row.times + '\')"><i class="fa fa-check-square-o"></i></button>';
-                    str += '<button type="button" class="registration-no-color-foot-button" title="详细" onclick="prescriptionDetail(\'' + row.realNo + '\',\'' + 71 + '\',\'' + row.orderNo + '\',\'' + row.receiptNo + '\',\'' + row.times + '\',\'' + row.patientId + '\')"><i class="fa fa-plus"></i></button>';
-                    return str;
-                }
             }
         ],
         responseHandler: function (res) {
@@ -460,27 +460,31 @@ function printPrescription(patientId, times, orderNo) {
                     var number = i + 1;
                     let manufactoryName = list[i].manufactoryName == null || list[i].manufactoryName == '' ? '' : '(' + list[i].manufactoryName + ')';
                     tr += '<tr>\n' +
-                        '                                <td style="width: 10px;" align="left" valign="top">' + number + "." +
+                        '                                <td style="margin-bottom: 5px;width: 10px;font-size: 14px;" align="left" valign="top">' + number + "." +
                         '</td>\n' +
-                        '                                <td style="vertical-align: middle !important;width: 260px;">\n' + list[i].drugName + manufactoryName +
+                        '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 260px;font-size: 14px;">\n' + list[i].drugName +
                         '                                </td>\n' +
-                        '                                <td style="vertical-align: middle !important;width: 120px;text-align: right;">' + list[i].specification +
+                        '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 120px;text-align: right;font-size: 14px;">' + list[i].specification +
                         '</td>\n' +
-                        '                                <td style="vertical-align: middle !important;width: 20px;text-align: right;">×</td>\n' +
-                        '                                <td style="vertical-align: middle !important;width: 20px;text-align: right;">' + list[i].quantity +
+                        '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 15px;text-align: left;font-size: 14px;">×</td>\n' +
+                        '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 15px;text-align: left;font-size: 14px;">' + list[i].quantity +
                         '</td>\n' +
-                        '                                <td style="vertical-align: middle !important;width: 30px;text-align: right;">' + list[i].ypUnitName +
+                        '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 25px;text-align: left;font-size: 14px;">' + list[i].ypUnitName +
                         '</td>\n' +
                         '                            </tr>\n' +
                         '                            <tr>\n' +
-                        '                                <td colspan="5" style="vertical-align: middle !important;text-align: right;">用法：' + list[i].drugQuan + list[i].drugUnitName + '/次 ' + list[i].frequency + ' ' + list[i].printName +
+                        '                                <td style="margin-bottom: 5px;width: 10px;font-size: 14px;" align="left" valign="top">' +
+                        '</td>\n' +
+                        '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 260px;font-size: 14px;">\n' + manufactoryName +
+                        '                                </td>\n' +
+                        '                                <td colspan="4" style="padding-left:0px;margin-bottom: 5px;vertical-align: middle !important;text-align: left;font-size: 14px;">用法：' + list[i].drugQuan+"&nbsp;" + list[i].drugUnitName + '/次&nbsp;&nbsp;' + list[i].frequency + '&nbsp;&nbsp;' + list[i].printName +
                         '</td>\n' +
-                        '                            </tr>';
+                        '                            </tr><tr><td>&nbsp;</td>></tr>';
                 }
                 $('#tbody_yp').html(tr);
+                $('#yxwk').remove();
                 if (list.length < 5) {
-                    $('#yxwk').remove();
-                    $('#div_yp').append('<span id="yxwk">以下为空</span>');
+                    $('#div_yp').append('<span id="yxwk" style="margin-bottom: 5px;font-size: 14px;">以下为空</span>');
                 }
                 LODOP = getLodop();
                 LODOP.PRINT_INITA(6, 0, "140mm", "202mm", "泰和医院处方笺");
@@ -491,9 +495,9 @@ function printPrescription(patientId, times, orderNo) {
                 LODOP.SET_SHOW_MODE("BKIMG_WIDTH", "140mm");
                 LODOP.SET_SHOW_MODE("BKIMG_HEIGHT", "202mm");
                 LODOP.SET_PRINT_MODE("CREATE_CUSTOM_PAGE_NAME", "门诊处方笺");//对新建的纸张重命名
-                LODOP.ADD_PRINT_HTM("5mm", "5mm", "140mm", "202mm",  $("div[id='print_view']").html());
-                // LODOP.NewPage();//下一页
+                LODOP.ADD_PRINT_HTM("5mm", "7mm", "140mm", "202mm",  $("div[id='print_view']").html());
                 LODOP.PRINT();
+                LODOP.NewPage();//下一页
                 //LODOP.PREVIEW();
                 successMesage(res);
             } else {

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

@@ -2,6 +2,7 @@
 var LODOP; //声明为全局变量
 var zsdPrintIndex;
 var bqPrintIndex;
+var fskPrintIndex;
 $(function () {
     openSocket("FY");
 
@@ -204,6 +205,21 @@ function initTbTable() {
         },
         columns: [
             {
+                title: '操作',
+                align: "center",
+                valign: 'middle',
+                visible: !visible,
+                formatter: function (value, row, index) {
+                    var str = "";
+                    if (sendRefundGroup == 0) {
+                        str = '<button type="button" class="registration-no-color-foot-button" title="打印" onclick="printInjectionOralMedicine(\'' + row.patientId + '\',\'' + row.orderNo + '\',\'' + row.realNo + '\',\'' + row.times + '\',\'' + row.receiptNo + '\');" style="color: #35D082;"><i class="fa fa-print"></i></button>';
+                        str += '<button type="button" class="registration-no-color-foot-button" title="叫号" onclick="callNumber(\'' + row.patientId + '\',\'' + row.name + '\')"><i class="glyphicon glyphicon-bullhorn"></i></button>';
+                        str += '<button type="button" class="registration-no-color-foot-button" title="发药" onclick="sendMedicineProcessing(\'' + row.realNo + '\',\'' + 71 + '\',\'' + row.orderNo + '\',\'' + row.receiptNo + '\',\'' + row.times + '\',\'' + row.patientId + '\',\'' + row.name + '\')"><i class="fa fa-check-square-o"></i></button>';
+                        str += '<button type="button" class="registration-no-color-foot-button" title="详细" onclick="prescriptionDetail(\'' + row.realNo + '\',\'' + 71 + '\',\'' + row.orderNo + '\',\'' + row.receiptNo + '\',\'' + row.times + '\',\'' + row.patientId + '\')"><i class="fa fa-plus"></i></button>';
+                    }
+                    return str;
+                }
+            },{
                 field: 'checked',
                 checkbox: true,
                 align: "center",
@@ -287,22 +303,6 @@ function initTbTable() {
                     return value == 1 ? "是" : "否";
                 }
             }*/
-            , {
-                title: '操作',
-                align: "center",
-                valign: 'middle',
-                visible: !visible,
-                formatter: function (value, row, index) {
-                    var str = "";
-                    if (sendRefundGroup == 0) {
-                        str = '<button type="button" class="registration-no-color-foot-button" title="打印" onclick="printInjectionOralMedicine(\'' + row.patientId + '\',\'' + row.orderNo + '\',\'' + row.realNo + '\',\'' + row.times + '\',\'' + row.receiptNo + '\');" style="color: #35D082;"><i class="fa fa-print"></i></button>';
-                        str += '<button type="button" class="registration-no-color-foot-button" title="叫号" onclick="callNumber(\'' + row.patientId + '\',\'' + row.name + '\')"><i class="glyphicon glyphicon-bullhorn"></i></button>';
-                        str += '<button type="button" class="registration-no-color-foot-button" title="发药" onclick="sendMedicineProcessing(\'' + row.realNo + '\',\'' + 71 + '\',\'' + row.orderNo + '\',\'' + row.receiptNo + '\',\'' + row.times + '\',\'' + row.patientId + '\',\'' + row.name + '\')"><i class="fa fa-check-square-o"></i></button>';
-                        str += '<button type="button" class="registration-no-color-foot-button" title="详细" onclick="prescriptionDetail(\'' + row.realNo + '\',\'' + 71 + '\',\'' + row.orderNo + '\',\'' + row.receiptNo + '\',\'' + row.times + '\',\'' + row.patientId + '\')"><i class="fa fa-plus"></i></button>';
-                    }
-                    return str;
-                }
-            }
         ],
         onClickRow: function (row) {
             if (sendRefundGroup == 1) {
@@ -716,7 +716,7 @@ function printInjectionOralMedicine(patientId, orderNo, realNo, times, receiptNo
                             '                                                    </td>\n' +
                             '                                                    <td style="vertical-align: middle !important;width: 60px;text-align: center;">\n' + data.orderDays +
                             '                                                    </td>\n' +
-                            '                                                    <td style="vertical-align: middle !important;width: 120px;text-align: center;">\n' + data.specification +
+                            '                                                    <td style="vertical-align: middle !important;width: 120px;text-align: left;">\n' + data.specification +
                             '                                                    </td>\n' +
                             '                                                </tr>';
                     }
@@ -773,10 +773,14 @@ function printInjectionOralMedicine(patientId, orderNo, realNo, times, receiptNo
                         }else{
                             let weight = (drugs[j].weight == '' || drugs[j].weight == null) ? drugs[j].volum : drugs[j].weight;
                             var drugQuan = (drugs[j].drugQuan / weight).toFixed(2);
-                            drugQuan = Math.round(drugQuan*100)/100;
-                            $("#ypbq_comm").attr("value", drugs[j].comm + ',每次' + drugQuan + drugs[j].miniUnitName);
+                            if(drugQuan == 0){
+                                $("#ypbq_comm").attr("value", drugs[j].comm + ',每次' + drugs[j].drugQuan + drugs[j].drugUnitName);
+                            }else{
+                                drugQuan = Math.round(drugQuan*100)/100;
+                                $("#ypbq_comm").attr("value", drugs[j].comm + ',每次' + drugQuan + drugs[j].miniUnitName);
+                            }
                         }
-                        LODOP.ADD_PRINT_HTM("5mm", "5mm", "RightMargin:5mm", "BottomMargin:5mm", $("div[id='print_view_bq']").html());
+                        LODOP.ADD_PRINT_HTM("5mm", "5mm", "80mm", "60mm", $("div[id='print_view_bq']").html());
                         LODOP.NewPage();//下一页
                     }
                     LODOP.PRINT();
@@ -836,7 +840,7 @@ function printRadSendMedicineStat(sendDate,startDate,endDate) {
                 LODOP.PRINT_INITA(6, 0, "241mm", "93.3mm", "放射科发药记录单");
                 LODOP.SET_PRINT_STYLE("FontSize", 9); //字体大小
                 //设置默认打印机
-                LODOP.SET_PRINTER_INDEX(zsdPrintIndex);
+                LODOP.SET_PRINTER_INDEX(fskPrintIndex);
                 LODOP.SET_PRINT_PAGESIZE(1, '241mm', '93.3mm', "CreateCustomPage");
                 LODOP.SET_SHOW_MODE("BKIMG_WIDTH", "241mm");
                 LODOP.SET_SHOW_MODE("BKIMG_HEIGHT", "93.3mm");
@@ -1295,10 +1299,10 @@ function saveRefundMedicine() {
  * @param patientId
  * @param name
  */
-function callNumber(patientId) {
+function callNumber(patientId,name) {
     $.ajax({
         type: "GET",
-        url: '/thmz/callNumber?patientId=' + patientId,
+        url: '/thmz/callNumber?patientId=' + patientId+"&name="+name,
         contentType: "application/json;charset=UTF-8",
         dataType: "json",
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
@@ -1320,7 +1324,7 @@ function callNumber(patientId) {
  * 查询默认打印机
  */
 function setPrint() {
-    if (zsdPrintIndex >= 0 && bqPrintIndex >= 0) {
+    if (zsdPrintIndex >= 0 && bqPrintIndex >= 0 && fskPrintIndex >= 0) {
         return;
     }
     $.ajax({
@@ -1338,9 +1342,11 @@ function setPrint() {
             if (res.code == 0) {
                 zsdPrintIndex = res.data.zsdPrintIndex;
                 bqPrintIndex = res.data.bqPrintIndex;
+                fskPrintIndex = res.data.fskPrintIndex;
             } else {
                 zsdPrintIndex = -1;
                 bqPrintIndex = -1;
+                fskPrintIndex = -1;
             }
         }
     });

src/main/resources/templates/mz/west_pharmacy_dispensing.html

@@ -82,54 +82,54 @@
 
         <div id="report_table" class="in"
              style="display: none;width:550px;height: 700px;margin:0 auto;border: 1px solid #337ab7;font-size: 16px;padding: 40px 20px 40px 20px;overflow-y: auto; overflow-x:hidden;">
-            <div id="print_view" style="position: relative">
+            <div id="print_view" style="position: relative;">
                 <div id="report_table_1">
-                    <h2 style="text-align:center;font-weight: 700;">泰和医院处方笺</h2>
+                    <h3 style="margin-left: 160px;">泰和医院处方笺</h3>
                     <div>
                         <form>
-                            <input style="border: 0px;width: 80px;margin-left: 380px;font-size: 20px;font-weight: bold;background-color: white;color: black;" disabled value="" id="drugFlag"/>
+                            <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>医疗/医保卡号:</span>
-                            <input style="border: 0px;width: 150px;background-color: white;color: black;" disabled value="" id="ybCardNo"/>
-                            <span style="margin-left: 10px;">处方号:</span>
-                            <input style="border: 0px;width: 120px;background-color: white;color: black;" disabled value="" id="realNo"/>
-                            <div style="border:1px solid black;width: 495px;"></div>
-                            <span>姓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名:</span>
-                            <input style="border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 75px;background-color: white;color: black;"
+                            <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"/>
+                            <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;"
                                    disabled value="" id="name"/>
-                            <span style="margin-left: 20px;">性别:</span>
-                            <input style="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: 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;"
                                    disabled value="" id="sex"/>
-                            <span style="margin-left: 20px;">年龄:</span>
-                            <input style="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: 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;"
                                    disabled value="" id="age"/>
-                            <span style="margin-left: 20px;">体重(KG):</span>
-                            <input style="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: 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: 43px;background-color: white;color: black;"
                                    disabled value=""/>
                             <br/>
-                            <span>病&nbsp;&nbsp;历&nbsp;&nbsp;号:</span>
-                            <input style="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: 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;"
                                    disabled value="" id="patientId"/>
-                            <span style="margin-left: 50px;">科&nbsp;&nbsp;&nbsp;&nbsp;别:</span>
-                            <input style="border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 162px;background-color: white;color: black;"
+                            <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;"
                                    disabled value="" id="warnDeptName"/>
                             <br/>
-                            <span>身份证号:</span>
-                            <input style="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: 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;"
                                    disabled value="" id="socialNo"/>
-                            <span style="margin-left: 50px;">手机号:</span>
-                            <input style="border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 162px;background-color: white;color: black;"
+                            <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;"
                                    disabled value="" id="phoneNo"/>
                             <br/>
-                            <span>临床诊断:</span>
-                            <input style="border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 422px;background-color: white;color: black;"
+                            <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;"
                                    disabled value="" id="icdText"/>
                             <br/>
-                            <span>地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址:</span>
-                            <input style="border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 250px;background-color: white;color: black;"
+                            <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-left: 10px;">日期:</span>
-                            <input style="border-top: 0px;border-left: 0px;border-right: 0px;border-bottom: 1px solid;width: 117px;background-color: white;color: black;" disabled value="" id="priceTime"/>
+                            <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/>
                         </form>
                     </div>
@@ -151,22 +151,22 @@
                             </tbody>
                         </table>
                     </div>
-                    <div id="zbr_div" style="position: absolute;top:640px; ">
-                        <div style="margin-top: 10px;"><span>医师(签章):</span>
-                            <input style="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: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;"
                                    disabled value="" id="employeeName"/>
-                            <span style="margin-left: 40px;">药品金额:</span>
-                            <input style="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: 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;"
                                    disabled value="" id="totalPrice"/>
                             <br/>
-                            <span>审核药师:</span>
-                            <input style="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;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-left: 17px;">调配药师/士:</span>
-                            <input style="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: 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-left: 17px;">核对、发药药师:</span>
-                            <input style="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: 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>

src/main/resources/templates/mz/west_pharmacy_send.html

@@ -191,54 +191,50 @@
                         <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             <span style="font-size:18px;font-weight: 700;">门诊</span>
                             患者药品标签&nbsp;&nbsp;
-                            <input style="border: 0px;width: 30px;background-color: white;color: black;" disabled
+                            <input style="margin-bottom:3px;border: 0px;width: 30px;background-color: white;color: black;" disabled
                                    value="" id="NO"/>
                         </span>
                         <form>
-                            <span>患者姓名:</span>
-                            <input style="border: 0px;width: 60px;background-color: white;color: black;" disabled
+                            <span style="margin-bottom:3px;">患者姓名:</span>
+                            <input style="margin-bottom:3px;border: 0px;width: 60px;background-color: white;color: black;" disabled
                                    value="" id="ypbq_name"/>
                             <span style="margin-left: 5px;">ID号:</span>
-                            <input style="border: 0px;width: 70px;background-color: white;color: black;" disabled
+                            <input style="margin-bottom:3px;border: 0px;width: 70px;background-color: white;color: black;" disabled
                                    value="" id="ypbq_patientId"/>
                             <br/>
-                            <span>性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别:</span>
-                            <input style="border: 0px;width: 60px;background-color: white;color: black;"
+                            <span style="margin-bottom:3px;">性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别:</span>
+                            <input style="margin-bottom:3px;border: 0px;width: 60px;background-color: white;color: black;"
                                    disabled value="" id="ypbq_sex"/>
-                            <span style="margin-left: 5px;">年龄:</span>
-                            <input style="border: 0px;width: 40px;background-color: white;color: black;"
+                            <span style="margin-bottom:3px;margin-left: 5px;">年龄:</span>
+                            <input style="margin-bottom:3px;border: 0px;width: 40px;background-color: white;color: black;"
                                    disabled value="" id="ypbq_age"/>
                             <br/>
-                            <span>流&nbsp;&nbsp;水&nbsp;&nbsp;号:</span>
-                            <input style="border: 0px;width: 60px;background-color: white;color: black;"
-                                   disabled value="" id="ypbq_realNo"/>
-                            <br/>
-                            <span>药品名称:</span>
-                            <input style="border: 0px;width: 180px;background-color: white;color: black;"
+                            <span style="margin-bottom:3px;">药品名称:</span>
+                            <input style="margin-bottom:3px;border: 0px;width: 180px;background-color: white;color: black;"
                                    disabled value="" id="ypbq_drugname"/>
                             <br/>
-                            <span>规格数量:</span>
-                            <input style="border: 0px;width: 110px;background-color: white;color: black;"
+                            <span style="margin-bottom:3px;">规格数量:</span>
+                            <input style="margin-bottom:3px;border: 0px;width: 110px;background-color: white;color: black;"
                                    disabled value="" id="ypbq_specification"/>
-                            <input style="border: 0px;width: 20px;background-color: white;color: black;"
+                            <input style="margin-bottom:3px;border: 0px;width: 20px;background-color: white;color: black;"
                                    disabled value="" id="ypbq_quantity"/>
-                            <input style="border: 0px;width: 20px;background-color: white;color: black;"
+                            <input style="margin-bottom:3px;border: 0px;width: 20px;background-color: white;color: black;"
                                    disabled value="" id="ypbq_ypUnitName"/>
                             <br/>
-                            <span>用法用量:</span>
-                            <input style="border: 0px;width: 60px;background-color: white;color: black;"
+                            <span style="margin-bottom:3px;">用法用量:</span>
+                            <input style="margin-bottom:3px;border: 0px;width: 60px;background-color: white;color: black;"
                                    disabled value="" id="ypbq_printName"/>
-                            <input style="border: 0px;width: 120px;background-color: white;color: black;"
+                            <input style="margin-bottom:3px;border: 0px;width: 130px;background-color: white;color: black;"
                                    disabled value="" id="ypbq_comm"/>
                             <br/>
-                            <span>嘱&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;托:</span>
-                            <input style="border: 0px;width: 180px;background-color: white;color: black;"
+                            <span style="margin-bottom:3px;">嘱&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;托:</span>
+                            <input style="margin-bottom:3px;border: 0px;width: 180px;background-color: white;color: black;"
                                    disabled value="" id="ypbq_instructionText"/>
                             <br/>
-                            <span>窗&nbsp;&nbsp;口&nbsp;&nbsp;号:</span>
-                            <input style="border: 0px;width: 35px;background-color: white;color: black;"
+                            <span style="margin-bottom:3px;">窗&nbsp;&nbsp;口&nbsp;&nbsp;号:</span>
+                            <input style="margin-bottom:3px;border: 0px;width: 35px;background-color: white;color: black;"
                                    disabled value="" id="ypbq_windowsNoYf"/>&nbsp;&nbsp;
-                            <input style="border: 0px;width: 120px;background-color: white;color: black;"
+                            <input style="margin-bottom:3px;border: 0px;width: 120px;background-color: white;color: black;"
                                    disabled value="" id="dataTime"/>
                             <br/>
                         </form>