فهرست منبع

优化操作,解决科室未更新

WANGJIALIANG 2 سال پیش
والد
کامیت
e6be786d62
2فایلهای تغییر یافته به همراه16 افزوده شده و 12 حذف شده
  1. 6 2
      src/main/resources/static/js/yf/ward_prescription.js
  2. 10 10
      src/main/resources/templates/yf/ward_prescription.html

+ 6 - 2
src/main/resources/static/js/yf/ward_prescription.js

@@ -1490,6 +1490,8 @@ function printLabel(datas, isMx) {
         for (let j = 0; j < tableDatas.length; j++) {
             if (tableDatas[j].fybz.indexOf("发药") != -1 && tableDatas[j].chargeCode == data.chargeCode
                 && tableDatas[j].serial == data.serial && (tableDatas[j].occTime == data.occTime || isMx == 0)) {
+                let w_code = $("#wardCode").find("option:selected").text();
+                $(".wardName").text(w_code.substring(0, w_code.lastIndexOf("(")));
                 $(".inpatientNo").text($.trim(data.inpatientNo));
                 $(".bedNo").text($.trim(data.bedNo));
                 $(".name").text($.trim(data.name));
@@ -1686,7 +1688,7 @@ function sendXy(flag) {
                 } else {
                     getPrintDetail(1);
                 }
-                if (!confirm("是否需要打印当前药单的口服标签?")) {
+                if (!confirm("是否需要打印当前药单的口服标签并使用摆药机?")) {
                     if (res.data) {
                         printLabelData(flag, 1);//口服药单,并使用摆药机
                         request({
@@ -1698,7 +1700,9 @@ function sendXy(flag) {
                         });
                     }
                 }
-                initButtonChange("#qld", 0);
+                groupNo === '81'?$("#submitFlagSearch").val("4"):$("#submitFlagSearch").val("3");
+                $("#submitFlagSearch").selectpicker('refresh');
+                initButtonChange("#"+(flag == 0 ? 'hz' : 'mx'), (flag == 0 ? 1 : 2));
             } else {
                 errorMesage(res);
             }

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

@@ -203,20 +203,20 @@
                         </tr>
                         <tr>
                             <td colspan="5" style="text-align: left;border: transparent !important;">
-                                <span>科&nbsp;&nbsp;&nbsp;&nbsp;室:</span><span class="wardName" style="display: inline-block;">三病室</span>
+                                <span>科&nbsp;&nbsp;&nbsp;&nbsp;室:</span><span class="wardName" style="display: inline-block;"></span>
                             </td>
                         </tr>
                         <tr>
                             <td colspan="5" style="text-align: left;border: transparent !important;">
-                                <span>住院号:</span><span class="inpatientNo" style="font-weight: 700;width: 80px;display: inline-block;">0367892</span>
-                                <span>性别:</span><span class="sex" style="width: 40px;display: inline-block;"></span>
-                                <span>床号:</span><span class="bedNo" style="font-weight: 700;font-size: 26px;">55</span>
+                                <span>住院号:</span><span class="inpatientNo" style="font-weight: 700;width: 80px;display: inline-block;"></span>
+                                <span>性别:</span><span class="sex" style="width: 40px;display: inline-block;"></span>
+                                <span>床号:</span><span class="bedNo" style="font-weight: 700;font-size: 26px;"></span>
                             </td>
                         </tr>
                         <tr>
                             <td colspan="5" style="text-align: left;border: transparent !important;">
-                                <span>姓&nbsp;&nbsp;&nbsp;&nbsp;名:</span><span class="name" style="font-weight: 700;font-size: 16px;width: 80px;display: inline-block;">温晴霖</span>
-                                <span>年龄:</span><span class="age" style="display: inline-block;">91岁</span>
+                                <span>姓&nbsp;&nbsp;&nbsp;&nbsp;名:</span><span class="name" style="font-weight: 700;font-size: 16px;width: 80px;display: inline-block;"></span>
+                                <span>年龄:</span><span class="age" style="display: inline-block;"></span>
                             </td>
                         </tr>
                         <tr>
@@ -225,20 +225,20 @@
                         </tr>
                         <tr>
                             <td colspan="5" style="text-align: left;border: transparent !important;">
-                                <span>药品名称:</span><span class="drugName">2022-2-8 04:00p</span>
+                                <span>药品名称:</span><span class="drugName"></span>
                             </td>
                         </tr>
                         <tr>
                             <td colspan="3" style="text-align: left;border: transparent !important;">
-                                <span>规格:</span><span class="specification">2022-2-8 04:00p</span>
+                                <span>规格:</span><span class="specification"></span>
                             </td>
                             <td colspan="2" style="text-align: left;border: transparent !important;">
-                                <span>剂量:</span><span class="dose" style="font-weight: 700;">2022-2-8 04:00p</span>
+                                <span>剂量:</span><span class="dose" style="font-weight: 700;"></span>
                             </td>
                         </tr>
                         <tr>
                             <td colspan="5" style="text-align: left;border: transparent !important;">
-                                <span>服药时间:</span><span class="occTime">2022-2-8 04:00p</span>
+                                <span>服药时间:</span><span class="occTime"></span>
                             </td>
                         </tr>
                         <!--<tr>