Forráskód Böngészése

门诊发药优化按钮控制,处理socket返回空

WANGJIALIANG 3 éve
szülő
commit
37ca693653

+ 2 - 3
src/main/java/cn/hnthyy/thmz/service/impl/thmz/DispensingSocketServiceImpl.java

@@ -148,13 +148,12 @@ public class DispensingSocketServiceImpl implements DispensingSocketService {
         map.put("objTypes", objTypes);
         //Map 转成  JSONObject 字符串
         JSONObject jsonObj = new JSONObject(map);
-        String result = "";
         try {
-            result = HttpUtil.sendHttpPost(webSocketServiceUrl, jsonObj.toString(), 6000,"utf-8");
+            HttpUtil.sendHttpPost(webSocketServiceUrl, jsonObj.toString(), 6000,"utf-8");
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return Integer.parseInt(result);
+        return 1;
     }
 
 }

+ 30 - 3
src/main/resources/static/js/mz/west_pharmacy_send.js

@@ -112,6 +112,7 @@ $(function () {
  * 批量发药处理
  */
 function batchSendMedicineProcessing(tem) {
+    $("#btn_batch_send").attr("disabled", true);
     $.ajax({
         type: "POST",
         url: '/thmz/batchSendMedicineProcessing',
@@ -120,6 +121,7 @@ function batchSendMedicineProcessing(tem) {
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
         data: JSON.stringify(tem),
         success: function (res) {
+            $("#btn_batch_send").attr("disabled", false);
             if (res == '401' || res == 401) {
                 window.location.href = '/thmz/login/view'
                 return;
@@ -130,6 +132,9 @@ function batchSendMedicineProcessing(tem) {
             } else {
                 errorMesage(res);
             }
+        },
+        error: function () {
+            $("#btn_batch_send").attr("disabled", false);
         }
     });
 }
@@ -222,6 +227,8 @@ function sendRefundButtonChange(object, realIndex) {
  * 发药处理
  */
 function sendMedicineProcessing(realNo, orderNo, receiptNo, times, patientId, name) {
+    $("#sendDispose").attr("disabled", true);
+    $("#sendDrug").attr("disabled", true);
     var temp = {
         winNo: winNo,
         mzChargeDetail: {
@@ -243,6 +250,8 @@ function sendMedicineProcessing(realNo, orderNo, receiptNo, times, patientId, na
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
         data: JSON.stringify(temp),
         success: function (res) {
+            $("#sendDispose").attr("disabled", false);
+            $("#sendDrug").attr("disabled", false);
             if (res == '401' || res == 401) {
                 window.location.href = '/thmz/login/view'
                 return;
@@ -254,6 +263,10 @@ function sendMedicineProcessing(realNo, orderNo, receiptNo, times, patientId, na
             } else {
                 errorMesage(res);
             }
+        },
+        error: function () {
+            $("#sendDispose").attr("disabled", false);
+            $("#sendDrug").attr("disabled", false);
         }
     });
 }
@@ -340,7 +353,7 @@ function initTbTable(pageIndex) {
                             str += '<button type="button" class="registration-no-color-foot-button" title="叫号" onclick="callNumber(\'' + row.patientId + '\',\'' + row.name + '\')"><i class="glyphicon glyphicon-bullhorn"></i></button>';
                         }
                         if (row.confirmFlag == 5 || row.confirmFlag == 0) {
-                            str += '<button type="button" class="registration-no-color-foot-button" title="发药" onclick="sendMedicineProcessing(\'' + row.realNo + '\',\'' + 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="发药" id="sendDrug" onclick="sendMedicineProcessing(\'' + row.realNo + '\',\'' + 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 + '\',\'' + row.orderNo + '\',\'' + row.receiptNo + '\',\'' + row.times + '\',\'' + row.patientId + '\',\'' + row.confirmFlag + '\')"><i class="fa fa-plus"></i></button>';
                     }
@@ -563,7 +576,7 @@ function initRadiologyTable() {
                     row.sendDate = (row.sendDate == null) ? '' : row.sendDate;
                     var str = '<button type="button" class="registration-no-color-foot-button" title="打印" onclick="printRadSendMedicineStat(\'' + row.sendDate + '\',\'' + row.startDate + '\',\'' + row.endDate + '\');" style="color: #35D082;background:#fff"><i class="fa fa-print"></i></button>';
                     if (index == 0 && row.pageIndex == 0) {
-                        str += '<button type="button" class="registration-no-color-foot-button" title="发药" onclick="sendMedicineProcessingRad()" style="background:#fff"><i class="fa fa-check-square-o"></i></button>';
+                        str += '<button type="button" class="registration-no-color-foot-button" title="发药" id="sendRad" onclick="sendMedicineProcessingRad()" style="background:#fff"><i class="fa fa-check-square-o"></i></button>';
                     }
                     return str;
                 }
@@ -717,6 +730,7 @@ function sendMedicineProcessingRad() {
     if (!confirm("确定要进行发药处理吗?")) {
         return;
     }
+    $("#sendRad").attr("disabled", true);
     $.ajax({
         type: "GET",
         url: '/thmz/sendMedicineProcessingRad',
@@ -725,6 +739,7 @@ function sendMedicineProcessingRad() {
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
         data: {},
         success: function (res) {
+            $("#sendRad").attr("disabled", false);
             if (res == '401' || res == 401) {
                 window.location.href = '/thmz/login/view'
                 return;
@@ -735,6 +750,9 @@ function sendMedicineProcessingRad() {
             } else {
                 errorMesage(res);
             }
+        },
+        error: function () {
+            $("#sendRad").attr("disabled", false);
         }
     });
 }
@@ -1482,6 +1500,7 @@ function saveRefundMedicine() {
     if (!confirm("确定要对当前处方的药品进行退药处理吗?")) {
         return;
     }
+    $("#btn_ty").attr("disabled", true);
     $.ajax({
         type: "POST",
         url: '/thmz/refundMedicineProcessing',
@@ -1490,6 +1509,7 @@ function saveRefundMedicine() {
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
         data: JSON.stringify(datas),
         success: function (res) {
+            $("#btn_ty").attr("disabled", false);
             if (res == '401' || res == 401) {
                 window.location.href = '/thmz/login/view'
                 return;
@@ -1500,6 +1520,9 @@ function saveRefundMedicine() {
             } else {
                 errorMesage(res);
             }
+        },
+        error: function () {
+            $("#btn_ty").attr("disabled", false);
         }
     });
 }
@@ -1518,6 +1541,7 @@ function saveCancelRefundMedicine() {
     if (!confirm("确定要撤销当前处方的退药吗?")) {
         return;
     }
+    $("#btn_cancel_ty").attr("disabled", true);
     request({
         url: '/cancelRefundMedicineProcessing',
         method: 'GET',
@@ -1527,9 +1551,12 @@ function saveCancelRefundMedicine() {
             orderNo: row[0].orderNo
         }
     }).then((res) => {
+        $("#btn_cancel_ty").attr("disabled", false);
         successMesage(res);
         initTbTable();
-    });
+    },err =>{
+        $("#btn_cancel_ty").attr("disabled",false);
+    })
 }
 
 /**