Browse Source

异步问题处理

WANGJIALIANG 3 years ago
parent
commit
a22a4e3cb6

+ 1 - 1
src/main/java/cn/hnthyy/thmz/controller/mz/MzPharmacyController.java

@@ -1095,7 +1095,7 @@ public class MzPharmacyController {
     @UserLoginToken
     @RequestMapping(value = "/getPrintFlag",method = RequestMethod.GET)
     public Map<String,Object> getPrintFlag(@RequestParam("patientId") String patientId,@RequestParam("times") String times
-            ,@RequestParam("orderNo") String orderNo){
+            ,@RequestParam("orderNo") Integer orderNo){
         Map<String, Object> resultMap = new HashMap<>();
         try {
             int printFlag = mzChargeDetailService.queryPrintFlag(patientId, times, orderNo);

+ 1 - 1
src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzChargeDetailMapper.java

@@ -1103,5 +1103,5 @@ public interface MzChargeDetailMapper {
      */
     @Select("SELECT max(isnull(print_flag,0)) as print_flag FROM mz_charge_detail WHERE patient_id=#{patientId} and times=#{times} and order_no=#{orderNo} ")
     Integer selectPrintFlag(@Param("patientId") String patientId, @Param("times") String times
-            , @Param("orderNo") String orderNo);
+            , @Param("orderNo") Integer orderNo);
 }

+ 1 - 1
src/main/java/cn/hnthyy/thmz/service/his/mz/MzChargeDetailService.java

@@ -437,5 +437,5 @@ public interface MzChargeDetailService {
      * @param orderNo
      * @return
      */
-    Integer queryPrintFlag(String patientId, String times, String orderNo);
+    Integer queryPrintFlag(String patientId, String times, Integer orderNo);
 }

+ 1 - 1
src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzChargeDetailServiceImpl.java

@@ -2058,7 +2058,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
     }
 
     @Override
-    public Integer queryPrintFlag(String patientId, String times, String orderNo) {
+    public Integer queryPrintFlag(String patientId, String times, Integer orderNo) {
         return mzChargeDetailMapper.selectPrintFlag(patientId,times,orderNo);
     }
 

+ 5 - 3
src/main/resources/static/js/common/socket-com.js

@@ -87,13 +87,15 @@ function dispensingMessage(data) {
         });
         if (chk_value != '') {//自动打印
             for (var i = 0; i < data.orderNos.length; i++) {
+                var orderNo = data.orderNos[i];
                 if(chk_value == 1){
                     $.ajax({
                         type: "GET",
+                        async: false,
                         data: {
                             patientId: data.patient_id,
                             times: data.times,
-                            orderNo: data.orderNos[i]
+                            orderNo: orderNo
                         },
                         url: '/thmz/getPrintFlag',
                         contentType: "application/json;charset=UTF-8",
@@ -101,12 +103,12 @@ function dispensingMessage(data) {
                         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
                         success: function (res) {
                             if (res.code == 0 && res.printFlag == 0) {
-                                printPrescription(data.patient_id, data.times,data.orderNos[i],1);
+                                printPrescription(data.patient_id, data.times,orderNo,1);
                             }
                         }
                     });
                 }else if(chk_value == 2){
-                    printDrugList(data.patient_id, data.times,data.orderNos[i]);
+                    printDrugList(data.patient_id, data.times,orderNo);
                 }
             }
         }