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/service/impl/his/yf/YfWardPrescriptionServiceImpl.java

@@ -442,8 +442,9 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
         for (int i = 0; i < yfWardVos.size(); i++) {
             YfWardVo yfWardVo = yfWardVos.get(i);
             YpZdDict ypZdDict = ypZdDictMapper.selectYpZdDictByCodeAndSerial(yfWardVo.getChargeCode(), yfWardVo.getSerial());
-            if(((yfWardVo.getPageClass().equals("5")||yfWardVo.getPageClass().equals("6")) && ypZdDict.getByjFlag() == 0)
-                    || ((!yfWardVo.getPageClass().equals("5")&&!yfWardVo.getPageClass().equals("6")) && "d".equals(yfWardVo.getDrugClass()))){
+            if(((yfWardVo.getPageClass().equals("5")||yfWardVo.getPageClass().equals("6")) && (submitFlag == 3 || ypZdDict.getByjFlag() == 0))//口服单
+                    || ((!yfWardVo.getPageClass().equals("5")&&!yfWardVo.getPageClass().equals("6")) && "d".equals(yfWardVo.getDrugClass()))//非口服单的口服药
+            ){
                 YzActOrder yzActOrder = yzActOrderMapper.selectYzActOrderByActOrderNo(yfWardVo.getActOrderNo());
                 yfWardVo.setDose(yzActOrder.getDose());
                 String ypUnitName = mzPharmacyMapper.selectYpUnitName(yzActOrder.getDoseUnit());
@@ -454,7 +455,7 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
                 }else{
                     dosage = yzActOrder.getDose()/yzActOrder.getDrugWeight()+"";
                 }
-                if(Double.parseDouble(dosage) < 1){
+                if(yzActOrder.getDrugWeight() <= 0 || Double.parseDouble(dosage) < 1){
                     dosage = NumberFormat.getInstance().format(yfWardVo.getDose())+ypUnitName;
                 }
                 yfWardVo.setDosage(dosage);

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

@@ -206,12 +206,14 @@ function initTbTable() {
                     field: 'cancelSubName',
                     title: '取消人',
                     align: "center",
-                    valign: 'middle'
+                    valign: 'middle',
+                    visible: $("#submitFlagSearch").val() == 2?true:false
                 }, {
                     field: 'cancelSubmitTime',
                     title: '取消时间',
                     align: "center",
                     valign: 'middle',
+                    visible: $("#submitFlagSearch").val() == 2?true:false,
                     formatter: function (value, row, index) {
                         if (value != null && value != "") {
                             return format(value, "yyyy-MM-dd HH:mm:ss");
@@ -570,7 +572,7 @@ function initDetailTable() {
             }
         }
     });
-    $("#t_tb_detail_table").append("<button class='registration-no-color-foot-button' title='打印药单明细' onclick='getPrintDetail()' style='margin-left: 10px;'><i class='fa fa-print'></i></button>");
+    $("#t_tb_detail_table").append("<button class='registration-no-color-foot-button' title='打印药单明细' onclick='getPrintDetail(0)' style='margin-left: 10px;'><i class='fa fa-print'></i></button>");
     $("#t_tb_detail_table").append("<button class='registration-no-color-foot-button' title='打印口服标签' onclick='printLabelData(1)' style='color: green;margin-left: 10px;'><i class='fa fa-print'></i></button>");
     if($("#submitFlagSearch").val() == 1){
         $("#t_tb_detail_table").append("<button class='registration-no-color-foot-button' title='保存' id='detail_save' onclick='save(1)' style='color: green;margin-left: 10px;'><i class='fa fa-floppy-o'></i></button>");
@@ -681,9 +683,10 @@ function printCount() {
 }
 
 /**
- * 打印明细单
+ *打印明细单
+ * @param flag 0:手动打印 1：保存后自动打印
  */
-function getPrintDetail() {
+function getPrintDetail(flag) {
     let datas = getJQAllData("tb_detail_table");
     if(pageClass=="5" || pageClass=="6"){
         $.ajax({
@@ -727,27 +730,31 @@ function getPrintDetail() {
                             }
                         }
                     }
-                    printDetail(res.data,1)
+                    printDetail(res.data,1,flag)
                 } else {
                     errorMesage(res);
                 }
             }
         });
     }else {
-        printDetail(datas,0);
+        printDetail(datas,0,flag);
     }
 }
 
-function printDetail(datas,kfFlag) {
+function printDetail(datas,kfFlag,flag) {
     if(kfFlag == 1){
-        if(datas.list.length > 0){
-            printDetailHtml(datas.list);
-        }
-        if(datas.byjList.length > 0){
-            printDetailHtml(datas.byjList);
+        if(flag == 0){
+            printDetailHtml(datas.list.concat(datas.byjList),flag);
+        }else if(flag == 1){
+            if(datas.list.length > 0){
+                printDetailHtml(datas.list,flag);
+            }
+            if(datas.byjList.length > 0){
+                printDetailHtml(datas.byjList,flag);
+            }
         }
     }else{
-        printDetailHtml(datas);
+        printDetailHtml(datas,flag);
     }
 
 }
@@ -755,7 +762,7 @@ function printDetail(datas,kfFlag) {
 /**
  *
  */
-function printDetailHtml(datas) {
+function printDetailHtml(datas,flag) {
     let html = '';
     let totalMoney = 0;
     let oldInpatientNo = '';//记录上一个病人
@@ -765,7 +772,7 @@ function printDetailHtml(datas) {
     }else if(pageClass == '6'){
         title = '临时口服领药单'
     }
-    if(datas[0].byjFlag == 1){
+    if(flag == 1 && datas[0].byjFlag == 1){
         title += '(摆药机)'
     }
     $(".title").text(title);
@@ -817,7 +824,7 @@ function printDetailHtml(datas) {
             html += '<td class="xtd" style="text-align: center;">' + data.frequCode + '</td>';
             html += '<td class="xtd" style="text-align: center;">' + data.dose + '</td>';
             html += '<td class="xtd" style="text-align: center;">' + data.doseUnit + '</td>';
-            html += '<td class="xtd" style="text-align: center;">' + data.instruction + '</td>';
+            html += '<td class="xtd" style="text-align: left;">' + data.instruction + '</td>';
             html += '<td class="xtd" style="text-align: center;">' + data.kssj + '</td>';
             html += '<td class="xtd" style="text-align: center;">' + data.jssj + '</td>';
             html += '<td class="xtd" style="text-align: center;">' + data.doctorNameStr + '</td>';
@@ -829,7 +836,7 @@ function printDetailHtml(datas) {
             html += '<td class="xtd" style="text-align: center;">' + data.frequCode + '</td>';
             html += '<td class="xtd" style="text-align: center;">' + data.dose + '</td>';
             html += '<td class="xtd" style="text-align: center;">' + data.doseUnit + '</td>';
-            html += '<td class="xtd" style="text-align: center;">' + data.instruction + '</td>';
+            html += '<td class="xtd" style="text-align: left;">' + data.instruction + '</td>';
             html += '<td class="xtd" style="text-align: center;">' + data.supplyName + '</td>';
             html += '<td class="xtd" style="text-align: center;">' + data.doctorNameStr + '</td>';
         }
@@ -895,15 +902,15 @@ function printLabelData(flag) {
  */
 function printLabel(datas,isMx) {
     LODOP = getLodop();
-    LODOP.PRINT_INITA(6, 0, "78", "66mm", "住院患者内服袋打印");
-    LODOP.SET_PRINT_PAGESIZE(1, "78mm", "66mm","");
+    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);
     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}</style>";
+        "border-style: solid;border-collapse: collapse;table-layout:fixed;word-wrap:break-word;font-size: 11px}.xtd{border: 1px solid black;}</style>";
     let html = '';
     let flag = true;//新的一张标签
     let number = 0;//计数，一张标签只存放五种药品
@@ -967,6 +974,7 @@ function printLabel(datas,isMx) {
     $("#bqdy_table").append(html);
     LODOP.ADD_PRINT_HTM("1mm", "3mm", "RightMargin:1mm", "BottomMargin:3mm",strStyle+ document.getElementById("bqdy_table_div").innerHTML);
     LODOP.PRINT();
+    //LODOP.PRINT_DESIGN();
 }
 
 /**
@@ -982,10 +990,11 @@ function print(div_id) {
     LODOP.SET_PRINT_STYLE("FontSize", 11); //字体大小
     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: 11}</style>";
+        "border-style: solid;border-collapse: collapse;table-layout:fixed;word-wrap:break-word;font-size: 11}.xtd{border: 1px solid black;}</style>";
     LODOP.ADD_PRINT_HTM("0mm", "4mm", "RightMargin:4mm", "BottomMargin:0mm",strStyle+ document.getElementById(div_id).innerHTML);
     LODOP.PRINT();
     //LODOP.PREVIEW();
+    //LODOP.PRINT_DESIGN();
 }
 
 /**
@@ -1028,6 +1037,12 @@ function save(flag){
             if (res.code == 0) {
                 successMesage(res);
                 initButtonChange("#qld",0);
+                printLabelData(flag);
+                if(flag == 0){
+                    printCount();
+                }else{
+                    getPrintDetail(1);
+                }
             } else {
                 errorMesage(res);
             }

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

@@ -34,13 +34,13 @@
                 <form id="formSearch" class="form-horizontal" autocomplete="off">
                     <div class="btn-group col-md-2 col-sm-2 col-xs-12" id="initButton">
                         <button id="qld" class="btn btn-sm btn-primary" type="button" onclick="initButtonChange(this,0)">
-                            &nbsp;&nbsp;请领单&nbsp;&nbsp;
+                            请领单
                         </button>
                         <button id="hz" class="btn btn-sm btn-default" type="button" onclick="initButtonChange(this,1)">
-                            &nbsp;&nbsp;汇总&nbsp;&nbsp;
+                            汇总
                         </button>
                         <button id="mx" class="btn btn-sm btn-default" type="button" onclick="initButtonChange(this,2)">
-                            &nbsp;&nbsp;明细&nbsp;&nbsp;
+                            明细
                         </button>
                     </div>
                     <div class="form-group">
@@ -126,7 +126,7 @@
             <div id="report_table_show"
                  style="display: none;width:1300px;height: calc(100% - 160px);margin:0 auto;border: 1px solid #337ab7;font-size: 13px;padding: 40px 10px 40px 10px;overflow: scroll">
                 <div id="hzdy_table_div">
-                    <table id="hzdy_table" class="table table-striped table-bordered" style="margin-top: 0px;border: transparent !important;">
+                    <table id="hzdy_table" class="table table-striped table-bordered" style="margin-top: 0px;border: none;">
                         <tr style="font-weight: 700;background-color: #EBEBE4">
                             <td colspan="9" style="font-size: 18px;text-align: center;border: transparent !important;"><span class="title">病房汇总领药单(统领单)</span></td>
                         </tr>
@@ -148,14 +148,14 @@
                             <td class="xtd" style="text-align: center;width: 150px;">药品名称</td>
                             <td class="xtd" style="text-align: center;width: 100px;">规格</td>
                             <td class="xtd" style="text-align: center;width: 60px;">数量</td>
-                            <td style="text-align: center;width: 150px;">生产厂家</td>
+                            <td class="xtd" style="text-align: center;width: 150px;">生产厂家</td>
                             <td class="xtd" style="text-align: center;width: 60px;">零售价</td>
                             <td class="xtd" style="text-align: center;width: 80px;">金额</td>
                         </tr>
                     </table>
                 </div>
                 <div id="mxdy_table_div">
-                    <table id="mxdy_table" class="table table-striped table-bordered" style="margin-top: 0px;border: transparent !important;">
+                    <table id="mxdy_table" class="table table-striped table-bordered" style="margin-top: 0px;border: none;">
                         <tr style="font-weight: 700;background-color: #EBEBE4">
                             <td colspan="13" style="font-size: 18px;text-align: center;border: transparent !important;"><span class="title">病房明细领药单（临时口服）</span></td>
                         </tr>
@@ -176,8 +176,8 @@
                             <td class="xtd" style="text-align: center;width: 40px;">床号</td>
                             <td class="xtd" style="text-align: center;width: 120px;">药品名称</td>
                             <td class="xtd" style="text-align: center;width: 80px;">规格</td>
-                            <td class="xtd" style="text-align: center;width: 60px;">请领量</td>
-                            <td class="xtd" style="text-align: center;width: 60px;">发药量</td>
+                            <td class="xtd" style="text-align: center;width: 40px;">请领量</td>
+                            <td class="xtd" style="text-align: center;width: 40px;">发药量</td>
                             <td class="xtd kfmxtd" style="text-align: center;width: 60px;">频率</td>
                             <td class="xtd kfmxtd" style="text-align: center;width: 40px;">剂量</td>
                             <td class="xtd kfmxtd" style="text-align: center;width: 40px;">单位</td>
@@ -193,7 +193,7 @@
                     </table>
                 </div>
                 <div id="bqdy_table_div" style="width:600px;">
-                    <table id="bqdy_table" class="table table-striped table-bordered" style="margin-top: 0px;border: transparent !important;">
+                    <table id="bqdy_table" class="table table-striped table-bordered" style="margin-top: 0px;border: none;">
                         <tr style="font-weight: 700;background-color: #EBEBE4">
                             <td colspan="5" style="font-size: 18px;text-align: center;border: transparent !important;"><span>住院患者内服袋</span></td>
                         </tr>
@@ -202,14 +202,14 @@
                         </tr>
                         <tr>
                             <td colspan="5" style="text-align: left;border: transparent !important;">
-                                <span>科室:</span><span class="wardName" style="width: 70px;display: inline-block;">三病室</span>
+                                <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;">0367892</span>
                                 <span>床号:</span><span class="bedNo" style="font-weight: 700;font-size: 16px;">55</span>
                             </td>
                         </tr>
                         <tr>
                             <td colspan="5" style="text-align: left;border: transparent !important;">
-                                <span>姓名:</span><span class="name" style="font-weight: 700;font-size: 16px;width: 70px;display: inline-block;">温晴霖</span>
+                                <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;">91岁</span>
                                 <span>性别:</span><span class="sex">男</span>
                             </td>
@@ -220,11 +220,11 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="xtd" style="text-align: center;width: 170px;">药品</td>
-                            <td class="xtd" style="text-align: center;width: 40px;">剂量</td>
-                            <td class="xtd" style="text-align: center;width: 100px;">规格</td>
-                            <td class="xtd" style="text-align: center;width: 40px;">服量</td>
-                            <td class="xtd" style="text-align: center;width: 40px;">领量</td>
+                            <td class="xtd" style="text-align: center;width: 40%;">药品</td>
+                            <td class="xtd" style="text-align: center;width: 15%;">剂量</td>
+                            <td class="xtd" style="text-align: center;width: 20%;">规格</td>
+                            <td class="xtd" style="text-align: center;width: 15%;">服量</td>
+                            <td class="xtd" style="text-align: center;width: 10%;">领量</td>
                         </tr>
                     </table>
                 </div>