Merge branch 'dev-1.1.1.1' into dev-1.1.3

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

@@ -646,6 +646,7 @@ public class MzPharmacyController {
                 }
                 totalPrice = totalPrice.add(chargeDetail.getUnitPrice().multiply(BigDecimal.valueOf(chargeDetail.getQuantity())));
                 map.put("quantity", chargeDetail.getQuantity());//数量
+                map.put("paySelf", chargeDetail.getPaySelf());//自备药
                 map.put("drugQuan", chargeDetail.getDrugQuan());//一次剂量
                 map.put("priceTime", chargeDetail.getPriceTime());//划价日期 开处方日期
                 map.put("frequency", chargeDetail.getFrequency());//频率
@@ -767,6 +768,7 @@ public class MzPharmacyController {
                     }
                     totalPrice = totalPrice.add(chargeDetail.getUnitPrice().multiply(BigDecimal.valueOf(chargeDetail.getQuantity())));
                     map.put("quantity", chargeDetail.getQuantity());//数量
+                    map.put("paySelf", chargeDetail.getPaySelf());//自备药
                     map.put("drugQuan", chargeDetail.getDrugQuan());//一次剂量
                     map.put("priceTime", chargeDetail.getPriceTime());//划价日期 开处方日期
                     map.put("frequency", chargeDetail.getFrequency());//频率

src/main/java/cn/hnthyy/thmz/entity/his/yp/YpZdDict.java

@@ -110,7 +110,7 @@ public class YpZdDict {
     //抗生素标志:1 抗生素
     private String kssFlag;
     private String zjFlag;
-    //对应旧系统表单空白输入框
+    //对应旧系统表单空白输入框 无用
     private String specB;
     private String ybCode;
     private String ybType;

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

@@ -936,7 +936,7 @@ public interface MzChargeDetailMapper {
             "SELECT c.patient_id,c.times,c.receipt_no,c.order_no,c.real_no,c.bill_item_code," +
             "c.group_no,c.charge_item_code,c.serial,c.warn_dept,c.price_time,c.doctor_code,c.confirm_id," +
             "c.quantity,c.drug_quan,c.frequency,c.charge_item_code,c.drug_unit,c.supply_code,c.doctor_code," +
-            "c.unit_price,c.yb_zf_flag,c.jz_flag,instruction_text,try_result,try_flag,  " +
+            "c.unit_price,c.yb_zf_flag,c.jz_flag,instruction_text,try_result,try_flag,c.pay_self,  " +
             " (case when y.class_code = '210100' then 1 else 0 end ) as is_hide,c.print_flag,c.drug_win,cy_jssm,cy_mtjs,cy_jsl,cy_zql,cy_fj,cy_ffcs,cy_fysm,rtrim(cy_dj)cy_dj" +
             "    FROM mz_charge_detail c WITH(NOLOCK) ,yp_zd_dict y WITH(NOLOCK) " +
             " where  1=1 " +

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

@@ -587,14 +587,14 @@ function printView(data) {
     }
     $('#tbody_yp').html(groupNo === '81' ? getZyPrintHtml(list) : getXyPrintHtml(list));
     LODOP = getLodop();
-    LODOP.PRINT_INITA(6, 0, "140mm", "202mm", "泰和医院处方笺");
+    LODOP.PRINT_INITA(6, 0, "140mm", "202mm", "泰和医院配药单");
     LODOP.SET_PRINT_STYLE("FontSize", 9); //字体大小
     //设置默认打印机
     LODOP.SET_PRINTER_INDEX(printIndex);
     LODOP.SET_PRINT_PAGESIZE(1, '140mm', '202mm', "CreateCustomPage");
     LODOP.SET_SHOW_MODE("BKIMG_WIDTH", "140mm");
     LODOP.SET_SHOW_MODE("BKIMG_HEIGHT", "202mm");
-    LODOP.SET_PRINT_MODE("CREATE_CUSTOM_PAGE_NAME", "门诊处方笺");//对新建的纸张重命名
+    LODOP.SET_PRINT_MODE("CREATE_CUSTOM_PAGE_NAME", "门诊配药单");//对新建的纸张重命名
     let strStyle='';
     let font = list.length>20?'font-size: 12px;padding: 2px 8px;':'font-size: 14px;padding: 8px;';
     if(groupNo === '81'){
@@ -630,6 +630,9 @@ function printDrugListView(data) {
     for (let i = 0; i < list.length; i++) {
         let tryResult = '';
         let tryFlag = '';
+        if(list[i].paySelf == 1 || list[i].ybZfFlag == 1){
+            continue
+        }
         if (list[i].tryResult == 0) {
             tryResult = '(—)';
         } else if (list[i].psFlag == 1 && list[i].tryFlag == 0) {//药品需要皮试，处方未点需要皮试
@@ -702,14 +705,15 @@ function getXyPrintHtml(list) {
         let printName = list[i].printName == null ? "" : list[i].printName;
         let tryResult = '';
         let tryFlag = '';
+        if(list[i].paySelf == 1 || list[i].ybZfFlag == 1){
+            continue
+        }
         if (list[i].tryResult == 0) {
             tryResult = '(—)';
         } else if (list[i].psFlag == 1 && list[i].tryFlag == 0) {//药品需要皮试，处方未点需要皮试
             tryResult = '<span style="color: red">(免试)</span>';
         }
-        if (list[i].ybZfFlag == 1) {
-            tryFlag = '<span style="color: red">(皮试自备一支)</span>';
-        } else if (list[i].tryFlag == 1) {
+        if (list[i].tryFlag == 1) {
             tryFlag = '<span style="color: red">(需皮试)</span>';
         }
         var number = i + 1;

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

@@ -85,7 +85,7 @@
              style="display:none;width:550px;height: 700px;margin:0 auto;border: 1px solid #337ab7;font-size: 16px;padding: 40px 20px 40px 20px;overflow-y: auto; overflow-x:hidden;">
             <div id="print_view" style="position: relative;">
                 <div id="report_table_1">
-                    <h3 style="margin-left: 160px;">泰和医院处方笺</h3>
+                    <h3 style="margin-left: 160px;">泰和医院配药单</h3>
                     <div>
                         <form>
                             <input style="border: 0px;width: 80px;margin-left: 380px;font-size: 17px;font-weight: bold;background-color: white;color: black;" disabled value="" id="drugFlag"/>