Browse Source

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

hurugang 3 years ago
parent
commit
a6c10a72ab

+ 2 - 2
src/main/java/cn/hnthyy/thmz/service/impl/his/yp/YpBaseYfServiceImpl.java

@@ -152,10 +152,10 @@ public class YpBaseYfServiceImpl implements YpBaseYfService {
             ypInDetlYf.setAcctType("1");
             ypInDetlYf.setFixPrice(fixPrice);
             ypInDetlYf.setGroupNo(ypOutDetlVo.getGroupNoOut());
-            ypInDetlYf.setCurrentStock(amount+(StringUtils.isEmpty(yp.getStockAmount())?0:yp.getStockAmount()));
+            ypInDetlYf.setCurrentStock(amount+(StringUtils.isEmpty(yp)?0:yp.getStockAmount()));
             ypInDetlYf.setSysDate(new Date());
             ypInDetlYf.setInputId(user.getUserIdCode());
-            ypInDetlYf.setStockAmount(yp.getStockAmount()==null?0:yp.getStockAmount());
+            ypInDetlYf.setStockAmount(StringUtils.isEmpty(yp)?0:yp.getStockAmount());
             ypInDetlYf.setGroupOut(ypOutDetlVo.getGroupNo());
             ypInDetlYf.setOutDrawNo(ypOutDetlVo.getDrawNo());
             ypInDetlYf.setInComment(inComment);

+ 26 - 20
src/main/resources/static/js/mz/west_pharmacy_dispensing.js

@@ -117,7 +117,7 @@ function initTable() {
                 valign: 'middle',
                 formatter: function (value, row, index) {
                     var str = '<button type="button" class="registration-no-color-foot-button" title="打印处方" onclick="printPrescription(\'' + row.patientId + '\',\'' + row.times+ '\',\'' + row.orderNo + '\')"  style="color: #35D082;"><i class="fa fa-print"></i></button>';
-                    str += '<button type="button" class="registration-no-color-foot-button" title="打印药单" onclick="printDrugList(\'' + row.patientId + '\',\'' + row.times+ '\',\'' + row.orderNo + '\')"  style="color: black;"><i class="fa fa-print"></i></button>';
+                    /*str += '<button type="button" class="registration-no-color-foot-button" title="打印药单" onclick="printDrugList(\'' + row.patientId + '\',\'' + row.times+ '\',\'' + row.orderNo + '\')"  style="color: black;"><i class="fa fa-print"></i></button>';*/
                     str += '<button type="button" class="registration-no-color-foot-button" title="详细" onclick="prescriptionDetail(\'' + row.realNo + '\',\'' + row.orderNo + '\',\'' + row.receiptNo + '\',\'' + row.times + '\',\'' + row.patientId + '\')"><i class="fa fa-plus"></i></button>';
                     return str;
                 }
@@ -592,33 +592,39 @@ function printView(data) {
         }
         var number = i + 1;
         let manufactoryName = list[i].manufactoryName == null || list[i].manufactoryName == '' ? '' : '(' + list[i].manufactoryName + ')';
-        tr += '<tr>\n' +
+        tr += '<tr>' +
             '                                <td style="margin-bottom: 5px;width: 10px;font-size: 14px;" align="left" valign="top">' + number + "." +
-            '</td>\n' +
-            '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">\n' + tryResult + list[i].drugName +
-            '                                </td>\n' +
+            '</td>' +
+            '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">' + tryResult + list[i].drugName +
+            '                                </td>' +
             '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 70px;text-align: right;font-size: 14px;">' + list[i].specification +
-            '</td>\n' +
-            '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 5px;text-align: left;font-size: 14px;">×</td>\n' +
+            '</td>' +
+            '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 5px;text-align: left;font-size: 14px;">×</td>' +
             '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 5px;text-align: left;font-size: 14px;">' + list[i].quantity +
-            '</td>\n' +
+            '</td>' +
             '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 25px;text-align: left;font-size: 14px;">' + list[i].ypUnitName +
-            '</td>\n' +
-            '                            </tr>\n' +
-            '                            <tr>\n' +
+            '</td>' +
+            '                            </tr>' +
+            '                            <tr>' +
             '                                <td style="margin-bottom: 5px;width: 10px;font-size: 14px;" align="left" valign="top">' +
-            '</td>\n' +
-            '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">\n' + manufactoryName + tryFlag +
-            '                                </td>\n' +
+            '</td>' +
+            '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">' + manufactoryName + tryFlag +
+            '                                </td>' +
             '                                <td colspan="4" style="padding-left:0px;margin-bottom: 5px;width:220px;vertical-align: middle !important;text-align: left;font-size: 14px;">用法:' + list[i].drugQuan+"&nbsp;" + list[i].drugUnitName + '/次&nbsp;&nbsp;' + list[i].frequency + '&nbsp;&nbsp;' + printName +
-            '</td>\n' +
+            '</td>' +
             '                            </tr>'+
-            '                            <tr>\n' +
+            '                            <tr>' +
             '                                <td style="margin-bottom: 5px;width: 10px;font-size: 14px;" align="left" valign="top">' +
-            '</td>\n' +
-            '                                <td colspan="5" style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">\n' + (list[i].instructionText==null?'':list[i].instructionText) +
-            '                                </td>\n' +
-            '                            </tr><tr><td>&nbsp;</td></tr>';
+            '</td>' +
+            '                                <td colspan="5" style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">' + (list[i].instructionText==null?'':list[i].instructionText) +
+            '                                </td>' +
+            '                            </tr>'+
+            '                            <tr>' +
+            '                                <td style="margin-bottom: 5px;width: 10px;font-size: 14px;" align="left" valign="top">' +
+            '</td>' +
+            '                                <td colspan="5" style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">' + '货位号:'+list[i].location +
+            '                                </td>' +
+            '                            </tr><tr style="height: 5px;"><td><img src="about:blank" width="5" height="5" /></td></tr>';
     }
     $('#tbody_yp').html(tr);
     $('#yxwk').remove();

+ 22 - 9
src/main/resources/static/js/yf/ward_prescription.js

@@ -501,7 +501,10 @@ function initDetailTable() {
             {name: 'bedNo', index: 'bedNo',align:'center',width:30,hidden:pageClass=='A'?true:false},
             {name: 'admissTimes', index: 'admissTimes',align:'center',width:30},
             {name: 'name', index: 'name',align:'center',width:30},
-            {name: 'drugName', index: 'drugName',align:'left',width:60},
+            {name: 'drugName', index: 'drugName',align:'left',width:60,
+                formatter:function(cellvalue, options, rowObject){
+                    return rowObject.drugName+"("+rowObject.manufactory+")"
+                }},
             {name: 'specification', index: 'specification',align:'center',width:40},
             {name: 'amount', index: 'amount',align:'center',width:30},
             {name: 'oldAmount', index: 'oldAmount',align:'center',width:30,hidden:true,
@@ -774,6 +777,8 @@ function printDetailHtml(datas,flag) {
     }
     if(flag == 1 && datas[0].byjFlag == 1){
         title += '(摆药机)'
+    }else if(flag == 0){
+        title += '(重打)'
     }
     $(".title").text(title);
     $(".groupName").text(groupNo==71?'门诊西药房':'住院药房');
@@ -789,7 +794,11 @@ function printDetailHtml(datas,flag) {
             html += '<td colspan="2" class="xtd" style="text-align: left;border: transparent !important;">年龄:' + getBirthSlot(data.birthDate,new Date()) + '</td>';
             html += '<td colspan="2" class="xtd" style="text-align: left;border: transparent !important;">性别:' + getSex(data.sex) + '</td>';
             html += '<td colspan="2" class="xtd" style="text-align: left;border: transparent !important;">身份:' + data.responceName + '</td>';
-            html += '<td colspan="7" class="xtd" style="text-align: left;border: transparent !important;">诊断:' + data.admissDiagStr + '</td>';
+            html += '<td colspan="7" class="xtd" style="text-align: left;border: transparent !important;">诊断:' ;
+            if(data.admissDiagStr!=null){
+                html += data.admissDiagStr
+            }
+            html += '</td>';
             html += '</tr>';
         }
         oldInpatientNo = data.inpatientNo;
@@ -802,7 +811,11 @@ function printDetailHtml(datas,flag) {
         }
         html += '<td class="xtd" style="text-align: center;">' + data.name + '</td>';
         html += '<td class="xtd" style="text-align: center;">' + data.bedNo + '</td>';
-        html += '<td class="xtd" style="text-align: left;">' + data.drugName + '</td>';
+        html += '<td class="xtd" style="text-align: left;">' + data.drugName;
+        if(pageClass == '5' || pageClass == '6'){
+            html += '('+data.manufactory+')'
+        }
+        + '</td>';
         html += '<td class="xtd" style="text-align: center;">' + data.specification + '</td>';
         html += '<td class="xtd" style="text-align: center;">' + data.oldAmount + '</td>';
         html += '<td class="xtd" style="text-align: center;">' + data.amount + '</td>';
@@ -910,7 +923,7 @@ function printLabel(datas,isMx) {
     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: 11px}.xtd{border: 1px solid black;}</style>";
+        "border-style: solid;border-collapse: collapse;table-layout:fixed;word-wrap:break-word;font-size: 13px}.xtd{border: 1px solid black;}</style>";
     let html = '';
     let flag = true;//新的一张标签
     let number = 0;//计数,一张标签只存放五种药品
@@ -983,15 +996,15 @@ function printLabel(datas,isMx) {
 function print(div_id) {
     setDefaultPrint();
     LODOP = getLodop();
-    LODOP.PRINT_INITA(6, 0, "241mm", "93mm", "请领单打印");
-    LODOP.SET_PRINT_PAGESIZE(1, "241mm", "93mm","");
+    LODOP.PRINT_INITA(6, 0, "221mm", "93mm", "请领单打印");
+    LODOP.SET_PRINT_PAGESIZE(1, "221mm", "93mm","");
     //设置默认打印机
     LODOP.SET_PRINTER_INDEX(defaultPrintIndex);
     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}.xtd{border: 1px solid black;}</style>";
-    LODOP.ADD_PRINT_HTM("0mm", "4mm", "RightMargin:4mm", "BottomMargin:0mm",strStyle+ document.getElementById(div_id).innerHTML);
+    var strStyle="<style>table,td,th {border-width: 1px;padding-bottom:0px;" +
+        "border-style: solid;border-collapse: collapse;table-layout:fixed;word-wrap:break-word;font-size: 13}.xtd{border: 1px solid black;}</style>";
+    LODOP.ADD_PRINT_HTM("0mm", "0mm", "RightMargin:0mm", "BottomMargin:0mm",strStyle+ document.getElementById(div_id).innerHTML);
     LODOP.PRINT();
     //LODOP.PREVIEW();
     //LODOP.PRINT_DESIGN();

+ 1 - 1
src/main/resources/templates/fy_config.html

@@ -54,7 +54,7 @@
                             </select>
                         </div>
                     </div>
-                    <div class="item form-group">
+                    <div class="item form-group" style="display:none;">
                         <label class="control-label col-md-3 col-sm-3 col-xs-12" for="printSelect_mzyd">门诊药房药单打印机
                         </label>
                         <div class="col-md-4 col-sm-4 col-xs-12">

+ 1 - 1
src/main/resources/templates/mz/west_pharmacy_dispensing.html

@@ -48,7 +48,7 @@
                             <label>
                                 处方自动打印 <input id="aotoPrint" name="aotoPrint" type="checkbox" value="1"/>
                             </label>
-                            <label>
+                            <label style="display: none">
                                 药单自动打印 <input id="aotoPrintYd" name="aotoPrint" type="checkbox" value="2"/>
                             </label>
                         </div>

+ 4 - 4
src/main/resources/templates/yf/ward_prescription.html

@@ -174,8 +174,8 @@
                             <td class="xtd zyh" 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: 120px;">药品名称</td>
-                            <td class="xtd" style="text-align: center;width: 80px;">规格</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: 40px;">请领量</td>
                             <td class="xtd" style="text-align: center;width: 40px;">发药量</td>
                             <td class="xtd kfmxtd" style="text-align: center;width: 60px;">频率</td>
@@ -220,11 +220,11 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="xtd" style="text-align: center;width: 40%;">药品</td>
+                            <td class="xtd" style="text-align: center;width: 35%;">药品</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>
+                            <td class="xtd" style="text-align: center;width: 15%;">领量</td>
                         </tr>
                     </table>
                 </div>