新增自动叫号开关，ajax提示修改

src/main/java/cn/hnthyy/thmz/controller/mz/MzPharmacyController.java

@@ -849,7 +849,9 @@ public class MzPharmacyController {
                 MzOrderFrequency mzOrderFrequencyByCode = mzOrderFrequencyService.getMzOrderFrequencyByCode(mzSendMedicineVo.getFrequency());
                 mzSendMedicineVo.setComm(mzOrderFrequencyByCode.getComm());
             }
-            dispensingSocketService.printSendToMedicine(mzChargeDetail.getPatientId());
+            if(mzChargeDetail.getAutoCellNumber() == 1){
+                dispensingSocketService.printSendToMedicine(mzChargeDetail.getPatientId());
+            }
             resultMap.put("code", 0);
             resultMap.put("message", "打印成功");
             resultMap.put("data", cfxxList);

src/main/java/cn/hnthyy/thmz/entity/his/mz/MzChargeDetail.java

@@ -207,6 +207,8 @@ public class MzChargeDetail implements Serializable,Comparable<MzChargeDetail> {
     private BigDecimal discountAmount;
     //是否隐藏（发药叫号用）
     private Integer isHide;
+    //自动叫号（发药叫号用）
+    private Integer autoCellNumber;
     public MzChargeDetail(String patientId, Integer times) {
         this.patientId = patientId;
         this.times = times;

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

@@ -712,6 +712,7 @@ function printInjectionOralMedicine(patientId, orderNo, realNo, times, receiptNo
         realNo: realNo,
         times: times,
         receiptNo: receiptNo,
+        autoCellNumber: $('#autoCellNumber').prop('checked')?1:0,
         groupNo: 71
     };
     $.ajax({
@@ -995,7 +996,6 @@ function queryParams(params) {
         warnDept: warnDept,
         groupNoOut: '71',
         isSendAndMatch: 1
-        /*isSendAndMatch: $('#sendAndMatch').prop('checked')?1:0*/
     };
     return temp;
 };

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

@@ -66,14 +66,13 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <div class="btn-group col-md-2 col-sm-2 col-xs-12"></div>
-                        <!--<div class="btn-group col-md-2 col-sm-2 col-xs-12">
+                        <div class="btn-group col-md-2 col-sm-2 col-xs-12">
                             <div class="checkbox">
                                 <label>
-                                    <input type="checkbox" id="sendAndMatch">发配一体
+                                    <input type="checkbox" id="autoCellNumber" checked>自动叫号
                                 </label>
                             </div>
-                        </div>-->
+                        </div>
                         <label class="control-label col-md-2 col-sm-2 col-xs-12"
                                for="confirmFlagSearch">状态</label>
                         <div class="col-md-2 col-sm-2 col-xs-12">

src/main/resources/templates/yf/spirit_anesthetic_print.html

@@ -166,7 +166,7 @@
     height: 60px;
     width: 300px;">
     <p style="text-align: center; vertical-align: central;">
-        请等待，正在查询数据<img src="/thmz/images/wait_dialog_icon.gif" />
+        请等待，正在查询数据<i class="fa fa-spinner fa-spin fa-2x fa-fw"></i>
     </p>
 </div>
 <!--加载中提示结尾-->

src/main/resources/templates/yf/yf_inventory.html

@@ -255,7 +255,7 @@
     height: 60px;
     width: 300px;">
     <p style="text-align: center; vertical-align: central;">
-        请等待，正在查询数据<img src="/thmz/images/wait_dialog_icon.gif" />
+        请等待，正在查询数据<i class="fa fa-spinner fa-spin fa-2x fa-fw"></i>
     </p>
 </div>
 <!--加载中提示结尾-->