处方添加货位号

接收入库null判断
隐藏自动打印药单

src/main/java/cn/hnthyy/thmz/service/impl/his/yp/YpBaseYfServiceImpl.java

@@ -152,10 +152,10 @@ public class YpBaseYfServiceImpl implements YpBaseYfService {
             ypInDetlYf.setAcctType("1");
             ypInDetlYf.setFixPrice(fixPrice);
             ypInDetlYf.setGroupNo(ypOutDetlVo.getGroupNoOut());
-            ypInDetlYf.setCurrentStock(amount+(StringUtils.isEmpty(yp.getStockAmount())?0:yp.getStockAmount()));
+            ypInDetlYf.setCurrentStock(amount+(StringUtils.isEmpty(yp)?0:yp.getStockAmount()));
             ypInDetlYf.setSysDate(new Date());
             ypInDetlYf.setInputId(user.getUserIdCode());
-            ypInDetlYf.setStockAmount(yp.getStockAmount()==null?0:yp.getStockAmount());
+            ypInDetlYf.setStockAmount(StringUtils.isEmpty(yp)?0:yp.getStockAmount());
             ypInDetlYf.setGroupOut(ypOutDetlVo.getGroupNo());
             ypInDetlYf.setOutDrawNo(ypOutDetlVo.getDrawNo());
             ypInDetlYf.setInComment(inComment);

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

@@ -117,7 +117,7 @@ function initTable() {
                 valign: 'middle',
                 formatter: function (value, row, index) {
                     var str = '<button type="button" class="registration-no-color-foot-button" title="打印处方" onclick="printPrescription(\'' + row.patientId + '\',\'' + row.times+ '\',\'' + row.orderNo + '\')"  style="color: #35D082;"><i class="fa fa-print"></i></button>';
-                    str += '<button type="button" class="registration-no-color-foot-button" title="打印药单" onclick="printDrugList(\'' + row.patientId + '\',\'' + row.times+ '\',\'' + row.orderNo + '\')"  style="color: black;"><i class="fa fa-print"></i></button>';
+                    /*str += '<button type="button" class="registration-no-color-foot-button" title="打印药单" onclick="printDrugList(\'' + row.patientId + '\',\'' + row.times+ '\',\'' + row.orderNo + '\')"  style="color: black;"><i class="fa fa-print"></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 + '\')"><i class="fa fa-plus"></i></button>';
                     return str;
                 }
@@ -592,33 +592,39 @@ function printView(data) {
         }
         var number = i + 1;
         let manufactoryName = list[i].manufactoryName == null || list[i].manufactoryName == '' ? '' : '(' + list[i].manufactoryName + ')';
-        tr += '<tr>\n' +
+        tr += '<tr>' +
             '                                <td style="margin-bottom: 5px;width: 10px;font-size: 14px;" align="left" valign="top">' + number + "." +
-            '</td>\n' +
-            '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">\n' + tryResult + list[i].drugName +
-            '                                </td>\n' +
+            '</td>' +
+            '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">' + tryResult + list[i].drugName +
+            '                                </td>' +
             '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 70px;text-align: right;font-size: 14px;">' + list[i].specification +
-            '</td>\n' +
-            '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 5px;text-align: left;font-size: 14px;">×</td>\n' +
+            '</td>' +
+            '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 5px;text-align: left;font-size: 14px;">×</td>' +
             '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 5px;text-align: left;font-size: 14px;">' + list[i].quantity +
-            '</td>\n' +
+            '</td>' +
             '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 25px;text-align: left;font-size: 14px;">' + list[i].ypUnitName +
-            '</td>\n' +
-            '                            </tr>\n' +
-            '                            <tr>\n' +
+            '</td>' +
+            '                            </tr>' +
+            '                            <tr>' +
             '                                <td style="margin-bottom: 5px;width: 10px;font-size: 14px;" align="left" valign="top">' +
-            '</td>\n' +
-            '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">\n' + manufactoryName + tryFlag +
-            '                                </td>\n' +
+            '</td>' +
+            '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">' + manufactoryName + tryFlag +
+            '                                </td>' +
             '                                <td colspan="4" style="padding-left:0px;margin-bottom: 5px;width:220px;vertical-align: middle !important;text-align: left;font-size: 14px;">用法：' + list[i].drugQuan+"&nbsp;" + list[i].drugUnitName + '/次&nbsp;&nbsp;' + list[i].frequency + '&nbsp;&nbsp;' + printName +
-            '</td>\n' +
+            '</td>' +
             '                            </tr>'+
-            '                            <tr>\n' +
+            '                            <tr>' +
             '                                <td style="margin-bottom: 5px;width: 10px;font-size: 14px;" align="left" valign="top">' +
-            '</td>\n' +
-            '                                <td colspan="5" style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">\n' + (list[i].instructionText==null?'':list[i].instructionText) +
-            '                                </td>\n' +
-            '                            </tr><tr><td>&nbsp;</td></tr>';
+            '</td>' +
+            '                                <td colspan="5" style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">' + (list[i].instructionText==null?'':list[i].instructionText) +
+            '                                </td>' +
+            '                            </tr>'+
+            '                            <tr>' +
+            '                                <td style="margin-bottom: 5px;width: 10px;font-size: 14px;" align="left" valign="top">' +
+            '</td>' +
+            '                                <td colspan="5" style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">' + '货位号:'+list[i].location +
+            '                                </td>' +
+            '                            </tr><tr style="height: 5px;"><td><img src="about:blank" width="5" height="5" /></td></tr>';
     }
     $('#tbody_yp').html(tr);
     $('#yxwk').remove();

src/main/resources/templates/fy_config.html

@@ -54,7 +54,7 @@
                             </select>
                         </div>
                     </div>
-                    <div class="item form-group">
+                    <div class="item form-group" style="display:none;">
                         <label class="control-label col-md-3 col-sm-3 col-xs-12" for="printSelect_mzyd">门诊药房药单打印机
                         </label>
                         <div class="col-md-4 col-sm-4 col-xs-12">

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

@@ -48,7 +48,7 @@
                             <label>
                                 处方自动打印 <input id="aotoPrint" name="aotoPrint" type="checkbox" value="1"/>
                             </label>
-                            <label>
+                            <label style="display: none">
                                 药单自动打印 <input id="aotoPrintYd" name="aotoPrint" type="checkbox" value="2"/>
                             </label>
                         </div>