门诊西药房配药单增加零售价

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

@@ -767,6 +767,7 @@ public class MzPharmacyController {
                 map.put("specification", ypZdDict.getSpecification());//规格
                 map.put("drugFlag", ypZdDict.getDrugFlag());//毒麻标志
                 map.put("psFlag", ypZdDict.getPsFlag());//是否需要皮试
+                map.put("packRetprice", ypZdDict.getPackRetprice());//药品零售价
                 YpBaseYf ypBaseYf = ypBaseYfService.queryYpBaseYf(chargeDetail.getChargeItemCode(), chargeDetail.getSerial(), chargeDetail.getGroupNo());
                 map.put("location",ypBaseYf.getLocation()==null?"":ypBaseYf.getLocation());
                 map.put("stockAmount",ypBaseYf.getStockAmount());

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

@@ -906,38 +906,42 @@ function getXyPrintHtml(list) {
             tryFlag = '<span style="color: red">(需皮试)</span>';
         }
         var number = i + 1;
-        let manufactoryName = list[i].manufactoryName == null || list[i].manufactoryName == '' ? '' : '(' + list[i].manufactoryName + ')';
+        let manufactoryName = list[i].manufactoryName == null || list[i].manufactoryName === '' ? '' : '(' + list[i].manufactoryName + ')';
         tr += '<tr>' +
             '    <td style="margin-bottom: 5px;width: 10px;font-size: 13px;" align="left" valign="top">' + number + "." +
-            '</td>' +
+            '    </td>' +
             '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 13px;">' + tryResult + list[i].drugName +
             '    </td>' +
             '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 70px;text-align: right;font-size: 13px;">' + list[i].specification +
-            '</td>' +
+            '    </td>' +
             '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 5px;text-align: left;font-size: 13px;">×</td>' +
             '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 5px;text-align: left;font-size: 13px;">' + list[i].quantity +
-            '</td>' +
+            '    </td>' +
             '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 25px;text-align: left;font-size: 13px;">' + list[i].ypUnitName +
-            '</td>' +
+            '    </td>' +
             '</tr>' +
             '<tr>' +
             '    <td style="margin-bottom: 5px;width: 10px;font-size: 13px;" align="left" valign="top">' +
-            '</td>' +
+            '    </td>' +
             '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 13px;">' + manufactoryName + tryFlag +
             '    </td>' +
-            '    <td colspan="4" style="padding-left:0px;margin-bottom: 5px;width:220px;vertical-align: middle !important;text-align: left;font-size: 13px;">用法：' + list[i].drugQuan + "&nbsp;" + list[i].drugUnitName + '/次&nbsp;&nbsp;' + list[i].frequencyName + '&nbsp;&nbsp;' + printName +
-            '</td>' +
+            '    <td colspan="4" style="padding-left:0;margin-bottom: 5px;width:220px;vertical-align: middle !important;text-align: left;font-size: 13px;">用法：' + list[i].drugQuan + "&nbsp;" + list[i].drugUnitName + '/次&nbsp;&nbsp;' + list[i].frequencyName + '&nbsp;&nbsp;' + printName +
+            '    </td>' +
             '</tr>' +
             '<tr>' +
             '    <td style="margin-bottom: 5px;width: 10px;font-size: 13px;" align="left" valign="top">' +
-            '</td>' +
+            '    </td>' +
             '    <td colspan="5" style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 13px;">' + (list[i].instructionText == null ? '' : list[i].instructionText) +
             '    </td>' +
             '</tr>' +
             '<tr>' +
             '    <td style="margin-bottom: 5px;width: 10px;font-size: 13px;" align="left" valign="top">' +
-            '</td>' +
-            '    <td colspan="5" style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 13px;">' + '货位号:' + list[i].location +
+            '    </td>' +
+            // '    <td colspan="5" style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 13px;">' + '货位号:' + list[i].location +
+            // '    </td>' +
+            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 13px;">货位号:' + list[i].location +
+            '    </td>' +
+            '    <td colspan="4" style="padding-left:0;margin-bottom: 5px;width:220px;vertical-align: middle !important;text-align: left;font-size: 13px;">零售价：' + list[i].packRetprice + '&nbsp;元/' + list[i].ypUnitName +
             '    </td>' +
             '</tr><tr style="height: 5px;"><td><img src="about:blank" width="5" height="5" /></td></tr>';
     }