Merge branch 'dev-1.1.4' into 'dev-1.1.4'

配药优化以及门诊发药排队优化

See merge request lihong/thmz_system!22

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

@@ -705,6 +705,7 @@ public class MzPharmacyController {
                 MzChargeDetail chargeDetail =  mzChargeDetails.get(i);
                 if(i == 0){
                     String warnDeptName = zdUnitCodeService.queryDeptNameByIdInCache(chargeDetail.getWarnDept());
+                    printMap.put("warnDeptCode", chargeDetail.getWarnDept());
                     printMap.put("warnDeptName", warnDeptName);//科室
                     if(StringUtils.isNotBlank(chargeDetail.getCyDj())){
                         MzZdSupplyType mzZdSupplyType = mzZdSupplyTypeService.selectMzZdSupplyTypeByCode(chargeDetail.getCyDj());
@@ -836,6 +837,7 @@ public class MzPharmacyController {
                     MzChargeDetail chargeDetail =  mzChargeDetails.get(i);
                     if(i == 0){
                         String warnDeptName = zdUnitCodeService.queryDeptNameByIdInCache(chargeDetail.getWarnDept());
+                        printMap.put("warnDeptCode", chargeDetail.getWarnDept());//科室
                         printMap.put("warnDeptName", warnDeptName);//科室
                         if(StringUtils.isNotBlank(chargeDetail.getCyDj())){
                             MzZdSupplyType mzZdSupplyType = mzZdSupplyTypeService.selectMzZdSupplyTypeByCode(chargeDetail.getCyDj());

src/main/resources/static/js/common/socket-com.js

@@ -7,7 +7,8 @@ var lineUpList = getLocalStorage("lineUpList", []);
 var currentList = getLocalStorage("currentList", []);
 //过号名单队列
 var pastList = getLocalStorage("pastList", []);
-
+//血液中心出发打印
+var printType = '';
 function openSocket(type) {
 //判断当前浏览器是否支持WebSocket
     try {
@@ -32,6 +33,9 @@ function openSocket(type) {
                             $('input[name="autoPrint"]:checked').each(function () {
                                 chk_value = $(this).val();
                             });
+                            $('input[name="printType"]:checked').each(function () {
+                                printType = $(this).val();
+                            });
                             if (type == 'PY' && chk_value != '') {//配药处方自动打印
                                 printPrescriptions(chk_value);
                             }
@@ -95,6 +99,9 @@ function dispensingMessage(data) {
         $('input[name="autoPrint"]:checked').each(function () {
             chk_value = $(this).val();
         });
+        $('input[name="printType"]:checked').each(function () {
+            printType = $(this).val();
+        });
         if (chk_value != '') {//自动打印
             for (var i = 0; i < data.orderNos.length; i++) {
                 var orderNo = data.orderNos[i];

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

@@ -639,8 +639,14 @@ function printPrescription(patientId, times, orderNo) {
             }
             if (res.code == 0) {
                 //setPrint();//初始化默认打印机
-                printView(res.data);
-                successMesage(res);
+                // 3：打印血液中心的处方
+                if(printType == '3' && res.data.warnDeptCode == '1020510'){
+                    printView(res.data);
+                    successMesage(res);
+                } else if(printType != '3' && res.data.warnDeptCode != '1020510'){
+                    printView(res.data);
+                    successMesage(res);
+                }
             } else {
                 errorMesage(res);
             }

src/main/resources/templates/index.html

@@ -101,6 +101,12 @@
                         <div class="clearfix"></div>
                     </div>
                     <div class="widget_summary">
+                        <div class="w_left w_25" style="width: 33.3%;cursor: pointer" onclick="changeContent('/thmz/pharmacy-cell')">
+                            <a class="pull-left  profile_thumb shortcuts" style="padding: 3px 3px;">
+                                <i class="fa fa-tasks"></i>
+                            </a>
+                            <span>发药排队</span>
+                        </div>
                         <div class="w_left w_25" style="width: 33.3%;cursor: pointer" onclick="changeContent('/thmz/ward-prescription')">
                             <a class="pull-left  profile_thumb shortcuts" style="padding: 3px 3px;">
                                 <i class="fa fa-medkit"></i>

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

@@ -189,7 +189,7 @@
                     </tr>
                     <tr>
                         <td colspan="9" style="border: transparent !important; height: 20px;margin-top: -5px; text-align: center;">
-                            <svg id="ydBarcode" height="20px"></svg>
+                            <svg id="ydBarcode" height="20"></svg>
                         </td>
                     </tr>
                     <tr style="font-weight: 700;background-color: #EBEBE4">