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

src/main/java/cn/hnthyy/thmz/mapper/his/yz/YzActOrderCyMapper.java

@@ -60,10 +60,10 @@ public interface YzActOrderCyMapper {
                     " and a.status_flag =#{statusFlag}",
                     "</when>",
                     "<when test='beginDate!=null'>",
-                    " and a.charge_date &gt;=#{beginDate,jdbcType=TIMESTAMP}",
+                    " and a.input_date &gt;=#{beginDate,jdbcType=TIMESTAMP}",
                     "</when>",
                     "<when test='endDate!=null'>",
-                    " and a.charge_date &lt;=#{endDate,jdbcType=TIMESTAMP}",
+                    " and a.input_date &lt;=#{endDate,jdbcType=TIMESTAMP}",
                     "</when>" +
                     " order by ward_code,page_no"
             , "</script>"})
@@ -99,7 +99,7 @@ public interface YzActOrderCyMapper {
                     "  cy_ffcs," +
                     "  cy_fysm," +
                     "  cy_jssm," +
-                    "  source_flag" +
+                    "  isnull(source_flag,0)source_flag" +
                     " FROM yz_act_order_cy a WITH(NOLOCK) " +
                     "where a.page_no = #{pageNo}"
             , "</script>"})

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

@@ -1480,6 +1480,11 @@ function printZyLabelData() {
     $('#zydybqModal').modal();
 }
 
+/**
+ * 打印标签
+ * @param datas
+ * @param isMx
+ */
 function printLabel(datas, isMx) {
     LODOP = getLodop();
     LODOP.PRINT_INITA(6, 0, "80mm", "60mm", "住院患者内服袋打印");
@@ -1489,50 +1494,46 @@ function printLabel(datas, isMx) {
     LODOP.SET_PRINT_STYLE("FontSize", 10); //字体大小
     LODOP.SET_PRINT_STYLEA(0, "ItemType", 2);
     LODOP.SET_PRINT_STYLEA(0, "ItemType", 2);
-    var strStyle = "<style>table,td,th {border-width: 1px;" +
-        "border-style: solid;border-collapse: collapse;table-layout:fixed;word-wrap:break-word;font-size: 16px}.xtd{border: 1px solid black;}</style>";
-    let tableDatas = getJQAllData(isMx == 1 ? "tb_detail_table" : "tb_summarizing_table");
-    for (var i = 0; i < datas.length; i++) {
-        let data = datas[i];
-        for (let j = 0; j < tableDatas.length; j++) {
-            if (tableDatas[j].fybz.indexOf("发药") != -1 && tableDatas[j].chargeCode == data.chargeCode
-                && tableDatas[j].serial == data.serial && (tableDatas[j].occTime == data.occTime || isMx == 0)) {
-                let w_code = $("#wardCode").find("option:selected").text();
-                $(".wardName").text(w_code.substring(0, w_code.lastIndexOf("(")));
-                $(".inpatientNo").text($.trim(data.inpatientNo));
-                $(".bedNo").text($.trim(data.bedNo));
-                $(".name").text($.trim(data.name));
-                $(".age").text(getBirthSlot(data.birthDate, new Date()));
-                $(".sex").text(getSex(data.sex));
-                $(".occTime").text(format(data.occTime, "yyyy/MM/dd HH:mm"));
-                $(".drugName").text(data.drugName);
-                $(".specification").text(data.specification);
-                $(".dose").text(data.dose + data.doseUnit);
-                $(".dosage").text(data.dosage.replace(".0", ""));
-                $(".instruction").text(data.instruction);
-                break;
+    if(pageClass == 5){//长期口服
+        printLabelLongTime(datas, isMx, LODOP);
+    }else {
+        let tableDatas = getJQAllData(isMx == 1 ? "tb_detail_table" : "tb_summarizing_table");
+        var strStyle = "<style>table,td,th {border-width: 1px;" +
+            "border-style: solid;border-collapse: collapse;table-layout:fixed;word-wrap:break-word;font-size: 16px}.xtd{border: 1px solid black;}</style>";
+        for (var i = 0; i < datas.length; i++) {
+            let data = datas[i];
+            for (let j = 0; j < tableDatas.length; j++) {
+                if (tableDatas[j].fybz.indexOf("发药") != -1 && tableDatas[j].chargeCode == data.chargeCode
+                    && tableDatas[j].serial == data.serial && (tableDatas[j].occTime == data.occTime || isMx == 0)) {
+                    let w_code = $("#wardCode").find("option:selected").text();
+                    $(".wardName").text(w_code.substring(0, w_code.lastIndexOf("(")));
+                    $(".inpatientNo").text($.trim(data.inpatientNo));
+                    $(".bedNo").text($.trim(data.bedNo));
+                    $(".name").text($.trim(data.name));
+                    $(".age").text(getBirthSlot(data.birthDate, new Date()));
+                    $(".sex").text(getSex(data.sex));
+                    $(".occTime").text(format(data.occTime, "yyyy/MM/dd HH:mm"));
+                    $(".drugName").text(data.drugName);
+                    $(".specification").text(data.specification);
+                    $(".dose").text(data.dose + data.doseUnit);
+                    $(".dosage").text(data.dosage.replace(".0", ""));
+                    $(".instruction").text(data.instruction);
+                    break;
+                }
             }
+            LODOP.ADD_PRINT_HTM("1mm", "3mm", "RightMargin:1mm", "BottomMargin:3mm", strStyle + document.getElementById("bqdy_table_div").innerHTML);
+            LODOP.NewPageA();
         }
-        LODOP.ADD_PRINT_HTM("1mm", "3mm", "RightMargin:1mm", "BottomMargin:3mm", strStyle + document.getElementById("bqdy_table_div").innerHTML);
-        LODOP.NewPageA();
+        LODOP.PRINT();
+        /*LODOP.NewPageA();*/
+        //LODOP.PRINT_DESIGN();
     }
-    LODOP.PRINT();
-    /*LODOP.NewPageA();*/
-    //LODOP.PRINT_DESIGN();
 }
 
 /**
- * 打印标签
-
-function printLabel(datas, isMx) {
-    LODOP = getLodop();
-    LODOP.PRINT_INITA(6, 0, "80mm", "60mm", "住院患者内服袋打印");
-    LODOP.SET_PRINT_PAGESIZE(1, "80mm", "60mm", "");
-    //设置打印机
-    LODOP.SET_PRINTER_INDEX(nfdPrintIndex);
-    LODOP.SET_PRINT_STYLE("FontSize", 10); //字体大小
-    LODOP.SET_PRINT_STYLEA(0, "ItemType", 2);
-    LODOP.SET_PRINT_STYLEA(0, "ItemType", 2);
+ * 打印口服标签
+ */
+function printLabelLongTime(datas, isMx, LODOP) {
     var strStyle = "<style>table,td,th {border-width: 1px;" +
         "border-style: solid;border-collapse: collapse;table-layout:fixed;word-wrap:break-word;font-size: 13px}.xtd{border: 1px solid black;}</style>";
     let html = '';
@@ -1554,11 +1555,10 @@ function printLabel(datas, isMx) {
                             html += '<td class="xtd"></td>';
                             html += '<td class="xtd"></td>';
                             html += '<td class="xtd"></td>';
-                            html += '<td class="xtd"></td>';
                             html += '</tr>';
                         }
-                        $("#bqdy_table").append(html);
-                        LODOP.ADD_PRINT_HTM("1mm", "3mm", "RightMargin:1mm", "BottomMargin:3mm", strStyle + document.getElementById("bqdy_table_div").innerHTML);
+                        $("#cq_bqdy_table").append(html);
+                        LODOP.ADD_PRINT_HTM("1mm", "3mm", "RightMargin:1mm", "BottomMargin:3mm", strStyle + document.getElementById("cq_bqdy_table_div").innerHTML);
                         LODOP.NewPageA();
                         html = '';
                         number = 0;
@@ -1578,9 +1578,8 @@ function printLabel(datas, isMx) {
                 }
                 html += '<tr class="sjh">';
                 html += '<td class="xtd" style="text-align: left;">' + data.drugName + '</td>';
-                html += '<td class="xtd" style="text-align: center;">' + data.dose + data.doseUnit + '</td>';
                 html += '<td class="xtd" style="text-align: center;">' + data.specification + '</td>';
-                html += '<td class="xtd" style="text-align: center;">' + data.dosage.replace(".0", "") + '</td>';
+                html += '<td class="xtd" style="text-align: center;">' + data.dose + data.doseUnit + '</td>';
                 html += '<td class="xtd" style="text-align: center;">' + data.amount + '</td>';
                 html += '</tr>';
                 number++;
@@ -1595,15 +1594,14 @@ function printLabel(datas, isMx) {
             html += '<td class="xtd"></td>';
             html += '<td class="xtd"></td>';
             html += '<td class="xtd"></td>';
-            html += '<td class="xtd"></td>';
             html += '</tr>';
         }
-        $("#bqdy_table").append(html);
-        LODOP.ADD_PRINT_HTM("1mm", "3mm", "RightMargin:1mm", "BottomMargin:3mm", strStyle + document.getElementById("bqdy_table_div").innerHTML);
+        $("#cq_bqdy_table").append(html);
+        LODOP.ADD_PRINT_HTM("1mm", "3mm", "RightMargin:1mm", "BottomMargin:3mm", strStyle + document.getElementById("cq_bqdy_table_div").innerHTML);
         LODOP.PRINT();
         //LODOP.PRINT_DESIGN();
     }
-}*/
+}
 
 /**
  * 打印报表

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

@@ -255,6 +255,42 @@
                         </tr>-->
                     </table>
                 </div>
+                <!--长期口服标签打印开始-->
+                <div id="cq_bqdy_table_div" style="width:600px;">
+                    <table id="cq_bqdy_table" class="table table-striped table-bordered" style="margin-top: 0px;border: none;">
+                        <tr style="font-weight: 700;background-color: #EBEBE4">
+                            <td colspan="4" style="font-size: 18px;text-align: center;border: transparent !important;"><span>住院患者内服袋</span></td>
+                        </tr>
+                        <tr>
+                            <td colspan="4" style="border: transparent !important;"></td>
+                        </tr>
+                        <tr>
+                            <td colspan="4" style="text-align: left;border: transparent !important;">
+                                <span>科室:</span><span class="wardName" style="width: 80px;display: inline-block;"></span>
+                                <span>住院号:</span><span class="inpatientNo" style="font-weight: 700;width: 60px;display: inline-block;"></span>
+                                <span>床号:</span><span class="bedNo" style="font-weight: 700;font-size: 16px;"></span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan="4" style="text-align: left;border: transparent !important;">
+                                <span>姓名:</span><span class="name" style="font-weight: 700;font-size: 16px;width: 80px;display: inline-block;"></span>
+                                <span>年&nbsp;&nbsp;&nbsp;&nbsp;龄:</span><span class="age" style="width: 60px;display: inline-block;"></span>
+                                <span>性别:</span><span class="sex"></span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan="4" style="text-align: left;border: transparent !important;">
+                                <span>服药时间:</span><span class="occTime"></span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="xtd" style="text-align: center;width: 45%;">药品</td>
+                            <td class="xtd" style="text-align: center;width: 25%;">规格</td>
+                            <td class="xtd" style="text-align: center;width: 15%;">剂量</td>
+                            <td class="xtd" style="text-align: center;width: 15%;">领量</td>
+                        </tr>
+                    </table>
+                </div>
                 <!--中药药品标签打印开始-->
                 <div id="print_view_zybq">
                         <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;