Merge branch 'dev-1.1.1' of https://172.16.32.165/hurugang/thmz_system into dev-1.1.1

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

@@ -204,7 +204,7 @@ public class MzPharmacyController {
             List<Map<String, Object>> ypMzFytjList = mzPharmacyService.getPrescriptionYpMx(chargeFeeParamsVo);
             for (Map<String, Object> stringObjectMap : ypMzFytjListRefund) {
                 for (Map<String, Object> objectMap : ypMzFytjList) {
-                    if (stringObjectMap.get("charge_item_code").equals(objectMap.get("charge_item_code"))) {
+                    if (stringObjectMap.get("item_no").equals(objectMap.get("item_no"))) {
                         objectMap.put("dec_amount", stringObjectMap.get("quantity"));
                     }
                 }

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

@@ -116,7 +116,7 @@ public interface YfSpiritAnestheticPrintMapper {
             "       i.sex," +
             "       warn_dept_name=h.name," +
             "       id=a.inpatient_no," +
-            "       icd_text=cast(b.admiss_diag_str as varchar(50))," +
+            "       icd_text=cast(isnull(b.admiss_diag_str,'') as varchar(50))," +
             "       drug_name=d.name," +
             "       abbr_name=e.name," +
             "       quantity = case when a.serial=d.serial then a.amount else a.amount/d.pack_size end," +
@@ -172,7 +172,7 @@ public interface YfSpiritAnestheticPrintMapper {
             "       i.sex," +
             "       warn_dept_name=h.name," +
             "       id=a.inpatient_no," +
-            "       icd_text=cast(b.admiss_diag_str as varchar(50))," +
+            "       icd_text=cast(isnull(b.admiss_diag_str,'') as varchar(50))," +
             "       drug_name=d.name," +
             "       abbr_name=e.name," +
             "       quantity=case when a.serial=d.serial then a.amount else a.amount/d.pack_size end," +
@@ -231,7 +231,7 @@ public interface YfSpiritAnestheticPrintMapper {
             "       b.sex," +
             "       warn_dept_name=h.name," +
             "       id=a.patient_id," +
-            "       icd_text=cast(i.icd_text as varchar(50))," +
+            "       icd_text=cast(isnull(i.icd_text,'') as varchar(50))," +
             "       drug_name=d.name," +
             "       abbr_name=e.name," +
             "       quantity = case when a.serial=d.serial then a.quantity*a.cy_fy else a.quantity*a.cy_fy/d.pack_size end," +

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

@@ -30,7 +30,7 @@ $(function () {
         let drugFlag = $("#drugFlagSearch").val();
         let title = "";
         if(drugFlag == 1){
-            title = "麻醉药品、精神一类药品使用登记";
+            title = "麻、精一及麻黄碱类药品使用登记";
             $("#jmtj_table").show();
             $("#qbtj_table").hide();
         }else if(drugFlag == 2){
@@ -38,7 +38,7 @@ $(function () {
             $("#jmtj_table").show();
             $("#qbtj_table").hide();
         }else if(drugFlag == 3){
-            title = "精二及麻黄碱类统计";
+            title = "精二类统计";
             $("#jmtj_table").show();
             $("#qbtj_table").hide();
         }else if(drugFlag == 0){
@@ -109,7 +109,7 @@ function getSpiritAnestheticPrintData() {
                         sex = "未知"
                     }
                     html += '<tr class="sjh">';
-                    html += '<td class="xtd" style="text-align: center;">' + data.chargeDate.substring(5,11) + '</td>';
+                    html += '<td class="xtd" style="text-align: center;mso-number-format: \'\\@\';">' + data.chargeDate.substring(5,11) + '</td>';
                     html += '<td class="xtd" style="text-align: center;">' + data.patientId + '</td>';
                     html += '<td class="xtd" style="text-align: center;">' + data.name + '</td>';
                     html += '<td class="xtd" style="text-align: center;">' + sex + '</td>';
@@ -133,11 +133,11 @@ function getSpiritAnestheticPrintData() {
                 let drugFlag = $("#drugFlagSearch").val();
                 let title = "";
                 if(drugFlag == 1){
-                    title = "麻醉药品、精神一类药品使用登记";
+                    title = "麻、精一及麻黄碱类药品使用登记";
                 }else if(drugFlag == 2){
                     title = "终止妊娠药统计";
                 }else if(drugFlag == 3){
-                    title = "精二及麻黄碱类统计";
+                    title = "精二类统计";
                 }
                 tableToExcel('jmtj_table', title);
             } else if (res.code == -1) {
@@ -314,11 +314,11 @@ function print() {
     LODOP.SET_PRINT_STYLEA(0,"ItemType",2);
     //设置默认打印机
     LODOP.SET_PRINTER_INDEX(defaultPrintIndex);
-    LODOP.ADD_PRINT_TEXT('195mm','140mm','40mm','40mm','第#页/共&页');
+    LODOP.ADD_PRINT_TEXT('200mm','140mm','40mm','40mm','第#页/共&页');
     LODOP.SET_PRINT_STYLEA(0,"ItemType",2);
-    var strStyle="<style>table{width: 1050px;} table,td,th {border-width: 1px;" +
+    var strStyle="<style>table,td,th {border-width: 1px;" +
         "border-style: solid;border-collapse: collapse;table-layout:fixed;word-wrap:break-word;font-size: 14px}</style>";
-    LODOP.ADD_PRINT_HTM("0mm", "2mm", "RightMargin:0mm", "BottomMargin:15mm",strStyle+ document.getElementById("report_table_1").innerHTML);
+    LODOP.ADD_PRINT_HTM("2mm", "4mm", "RightMargin:4mm", "BottomMargin:15mm",strStyle+ document.getElementById("report_table_1").innerHTML);
     //LODOP.PRINT();
     LODOP.PREVIEW();
 }
@@ -332,12 +332,12 @@ function queryParams() {
     if(flag == 1){
         drugFlags[0] = 2;
         drugFlags[1] = 3;
+        drugFlags[2] = 5;
     }else if(flag == 2){
         drugFlags[0] = 6;
     }else if(flag == 3){
         drugFlags[0] = 1;
         drugFlags[1] = 4;
-        drugFlags[2] = 5;
     }
     var temp = {
         beginDate: getRePortRangeArr()[0],

src/main/resources/templates/yf/spirit_anesthetic_print.html

@@ -66,9 +66,9 @@
                                 <select class="form-control selectpicker show-tick" required="required" title="请选择"
                                         id="drugFlagSearch">
                                     <option value="0" selected>全部</option>
-                                    <option value="1">麻、精一</option>
+                                    <option value="1">麻、精一及麻黄碱类</option>
                                     <option value="2">终止妊娠药</option>
-                                    <option value="3">精二及麻黄碱类</option>
+                                    <option value="3">精二</option>
                                 </select>
                             </div>
                         </div>