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

优化药品下拉选模糊查询，门诊西药配药单打印，药品发药明细统计

See merge request hurugang/thmz_system!8

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

@@ -685,6 +685,12 @@ public class MzPharmacyController {
                 map.put("drugQuan", chargeDetail.getDrugQuan());//一次剂量
                 map.put("priceTime", chargeDetail.getPriceTime());//划价日期 开处方日期
                 map.put("frequency", chargeDetail.getFrequency());//频率
+                MzOrderFrequency mzOrderFrequencyByCode = mzOrderFrequencyService.getMzOrderFrequencyByCode(chargeDetail.getFrequency());
+                if(null != mzOrderFrequencyByCode){
+                    map.put("frequencyName", mzOrderFrequencyByCode.getComm()); //频率释义
+                } else {
+                    map.put("frequencyName", chargeDetail.getFrequency());
+                }
                 map.put("jzFlag", chargeDetail.getJzFlag());//急诊标记
                 map.put("instructionText", chargeDetail.getInstructionText());//嘱托说明
                 map.put("tryResult", chargeDetail.getTryResult());//皮试结果

src/main/java/cn/hnthyy/thmz/mapper/his/yf/YfSpiritAnestheticPrintMapper.java

@@ -259,7 +259,8 @@ public interface YfSpiritAnestheticPrintMapper {
             "       a.receipt_no = g.receipt_no and" +
             "       a.order_no = g.order_no and" +
             "       a.item_no = g.item_no and" +
-            "       g.supply_code = k.supply_code and" +
+            "       a.charge_item_code = g.charge_item_code and" +
+            "       g.supply_code *= k.supply_code and" +
             "       isnull(a.confirm_flag,2) != 2 and" +
             "       a.quantity !=0 and" +
             "       <when test='sendDrugRecordVo.beginDate != null'>" +

src/main/java/cn/hnthyy/thmz/mapper/his/yp/YpBaseYfMapper.java

@@ -191,10 +191,10 @@ public interface YpBaseYfMapper {
             "         yp_zd_dict b WITH(NOLOCK)" +
             "   WHERE ( a.serial = b.serial )  and" +
             "          a.charge_code = b.code  and" +
-            "          (isnull(b.py_code,'') like '${searchText}%' or" +
-            "          isnull(b.d_code,'') like '${searchText}%' or" +
-            "          a.charge_code like '${searchText}%' or" +
-            "          b.name like '${searchText}%') and" +
+            "          (isnull(b.py_code,'') like '%${searchText}%' or" +
+            "          isnull(b.d_code,'') like '%${searchText}%' or" +
+            "          a.charge_code like '%${searchText}%' or" +
+            "          b.name like '%${searchText}%') and" +
             "          a.group_no = #{groupNo} and " +
             "          isnull(b.del_flag,0) != 1")
     List<YpZdDictVo> selectYpBaseYfLike(@Param("searchText") String searchText, @Param("groupNo") String groupNo);

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

@@ -844,7 +844,7 @@ function getXyPrintHtml(list) {
             '</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 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].frequencyName + '&nbsp;&nbsp;' + printName +
             '</td>' +
             '</tr>' +
             '<tr>' +