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

发药优化名字显示

See merge request hurugang/thmz_system!23

src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzYpFydlMapper.java

@@ -63,7 +63,7 @@ public interface MzYpFydlMapper {
      * @return
      */
     @Select("  SELECT DISTINCT rtrim(mz_charge_detail.patient_id)patient_id," +
-            "         rtrim(mz_charge_detail.name)name," +
+            "         (LEFT(rtrim(mz_charge_detail.name),1) + '*' + RIGHT(rtrim(mz_charge_detail.name), LEN(rtrim(mz_charge_detail.name))-2)) name," +
             "         rtrim(confirm_flag)confirm_flag," +
             "         rtrim(windows_no_yf)windows_no_yf" +
             "    FROM mz_charge_detail WITH(NOLOCK),yp_zd_dict WITH(NOLOCK)" +

src/main/resources/static/js/yf/ward_prescription.js

@@ -1189,7 +1189,8 @@ function printXyCount(flag) {
     html += '<td colspan="3" style="text-align: left;font-weight: 700;border: transparent !important;">领药人：</td>';
     html += '</tr>';
     $("#hzdy_table").append(html);
-    let pageClassSearch = $("#pageClassSearch").find("option:selected").text();
+    let $pageClassSearch = $('#pageClassSearch');
+    let pageClassSearch = $pageClassSearch.find("option:selected").text();
     if(isEmpty(pageClassSearch)){
         errorMesageSimaple("打印表头参数为空，请联系管理员");
         return;