湖南泰和医院换成长沙泰和医院，门诊病历诊断打印

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

@@ -107,7 +107,7 @@ public class MzBlRecordController {
             results.put("mzPatientMi", mzPatientMi);
             MzVisitTable mzVisitTable = mzVisitTableService.queryByPatientIdAndTimes(patientId, times);
             if (mzVisitTable != null && mzVisitTable.getIcdText() != null && StringUtils.isNotBlank(mzVisitTable.getIcdText())) {
-                results.put("icdText", mzVisitTable.getIcdText());
+                results.put("icdText", StringUtils.isBlank(mzBlRecord.getTentativeDiagnosis())?mzVisitTable.getIcdText():mzVisitTable.getIcdText()+" "+mzBlRecord.getTentativeDiagnosis());
             }
             return results;
         } catch (Exception e) {

src/main/java/cn/hnthyy/thmz/service/impl/thmz/OrderStatusChangeServiceImpl.java

@@ -135,7 +135,7 @@ public class OrderStatusChangeServiceImpl implements OrderStatusChangeService {
                         doctorName = employee.getEmployeeName();
                     }
                 }
-                haiCiAdapterService.commonMessageNotice(mzPatientMi.getIcCardNo(), "{\"data\":{\"first\":{\"color\":\"#FF0000\",\"value\":\"您好，您本次缴费账单消息：\"},\"keynote1\":{\"color\":\"#173177\",\"value\":\"" + mzChargeDetail.getName() + "\"},\"keynote2\":{\"color\":\"#173177\",\"value\":\"" + arr[0] + "\"},\"keynote3\":{\"color\":\"#173177\",\"value\":\"" + mzChargeDetail.getAmount() + "\"},\"keynote4\":{\"color\":\"#173177\",\"value\":\"" + doctorName + "\"},\"keynote5\":{\"color\":\"#173177\",\"value\":\"" + zdUnitCode.getName() + "\"},\"keynote6\":{\"color\":\"#173177\",\"value\":\"湖南泰和医院\"},\"keynote7\":{\"color\":\"#173177\",\"value\":\"" + DateFormatUtils.format(mzChargeDetail.getChargeDate(), "yyyy-MM-dd HH:mm:ss") + "\"},\"remark\":{\"color\":\"#FF0000\",\"value\":\" 缴费已成功，湖南泰和医院祝您身体健康。\"}},\"miniprogram\":{\"appid\":\"\",\"pagepath\":\"\"},\"template_id\":\"IGc0AXcLvxD7TUvtjH4EA91xQppYMKBYObHXayBNd6A\",\"touser\":\"\",\"url\":\"\"}", new Date());
+                haiCiAdapterService.commonMessageNotice(mzPatientMi.getIcCardNo(), "{\"data\":{\"first\":{\"color\":\"#FF0000\",\"value\":\"您好，您本次缴费账单消息：\"},\"keynote1\":{\"color\":\"#173177\",\"value\":\"" + mzChargeDetail.getName() + "\"},\"keynote2\":{\"color\":\"#173177\",\"value\":\"" + arr[0] + "\"},\"keynote3\":{\"color\":\"#173177\",\"value\":\"" + mzChargeDetail.getAmount() + "\"},\"keynote4\":{\"color\":\"#173177\",\"value\":\"" + doctorName + "\"},\"keynote5\":{\"color\":\"#173177\",\"value\":\"" + zdUnitCode.getName() + "\"},\"keynote6\":{\"color\":\"#173177\",\"value\":\"长沙泰和医院\"},\"keynote7\":{\"color\":\"#173177\",\"value\":\"" + DateFormatUtils.format(mzChargeDetail.getChargeDate(), "yyyy-MM-dd HH:mm:ss") + "\"},\"remark\":{\"color\":\"#FF0000\",\"value\":\" 缴费已成功，长沙泰和医院祝您身体健康。\"}},\"miniprogram\":{\"appid\":\"\",\"pagepath\":\"\"},\"template_id\":\"IGc0AXcLvxD7TUvtjH4EA91xQppYMKBYObHXayBNd6A\",\"touser\":\"\",\"url\":\"\"}", new Date());
                 MzYjReq mzYjReq = new MzYjReq(patientInfo[0], Integer.valueOf(patientInfo[1]));
                 mzYjReq.setReceiptNo(Integer.valueOf(patientInfo[2]));
                 List<String> execDeps = mzYjReqService.queryExecDept(mzYjReq);
@@ -261,7 +261,7 @@ public class OrderStatusChangeServiceImpl implements OrderStatusChangeService {
 //                            doctorName = employee.getEmployeeName();
 //                        }
 //                    }
-//                    haiCiAdapterService.commonMessageNotice(mzPatientMi.getIcCardNo(), "{\"data\":{\"first\":{\"color\":\"#FF0000\",\"value\":\"您好，您本次缴费账单消息：\"},\"keynote1\":{\"color\":\"#173177\",\"value\":\"" + mzChargeDetail.getName() + "\"},\"keynote2\":{\"color\":\"#173177\",\"value\":\"" + arr[0] + "\"},\"keynote3\":{\"color\":\"#173177\",\"value\":\"" + mzChargeDetail.getAmount() + "\"},\"keynote4\":{\"color\":\"#173177\",\"value\":\"" + doctorName + "\"},\"keynote5\":{\"color\":\"#173177\",\"value\":\"" + zdUnitCode.getName() + "\"},\"keynote6\":{\"color\":\"#173177\",\"value\":\"湖南泰和医院\"},\"keynote7\":{\"color\":\"#173177\",\"value\":\"" + DateFormatUtils.format(mzChargeDetail.getChargeDate(), "yyyy-MM-dd HH:mm:ss") + "\"},\"remark\":{\"color\":\"#FF0000\",\"value\":\" 缴费已成功，湖南泰和医院祝您身体健康。\"}},\"miniprogram\":{\"appid\":\"\",\"pagepath\":\"\"},\"template_id\":\"IGc0AXcLvxD7TUvtjH4EA91xQppYMKBYObHXayBNd6A\",\"touser\":\"\",\"url\":\"\"}", new Date());
+//                    haiCiAdapterService.commonMessageNotice(mzPatientMi.getIcCardNo(), "{\"data\":{\"first\":{\"color\":\"#FF0000\",\"value\":\"您好，您本次缴费账单消息：\"},\"keynote1\":{\"color\":\"#173177\",\"value\":\"" + mzChargeDetail.getName() + "\"},\"keynote2\":{\"color\":\"#173177\",\"value\":\"" + arr[0] + "\"},\"keynote3\":{\"color\":\"#173177\",\"value\":\"" + mzChargeDetail.getAmount() + "\"},\"keynote4\":{\"color\":\"#173177\",\"value\":\"" + doctorName + "\"},\"keynote5\":{\"color\":\"#173177\",\"value\":\"" + zdUnitCode.getName() + "\"},\"keynote6\":{\"color\":\"#173177\",\"value\":\"长沙泰和医院\"},\"keynote7\":{\"color\":\"#173177\",\"value\":\"" + DateFormatUtils.format(mzChargeDetail.getChargeDate(), "yyyy-MM-dd HH:mm:ss") + "\"},\"remark\":{\"color\":\"#FF0000\",\"value\":\" 缴费已成功，长沙泰和医院祝您身体健康。\"}},\"miniprogram\":{\"appid\":\"\",\"pagepath\":\"\"},\"template_id\":\"IGc0AXcLvxD7TUvtjH4EA91xQppYMKBYObHXayBNd6A\",\"touser\":\"\",\"url\":\"\"}", new Date());
 //                    MzYjReq mzYjReq = new MzYjReq(patientInfo[0], Integer.valueOf(patientInfo[1]));
 //                    mzYjReq.setReceiptNo(Integer.valueOf(patientInfo[2]));
 //                    List<String> execDeps = mzYjReqService.queryExecDept(mzYjReq);

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

@@ -6787,7 +6787,7 @@ function printPrescription(patientId, times, clnicId, payMark, printType) {
                     var index = 0;
                     setPrint();
                     LODOP = getLodop();
-                    LODOP.PRINT_INITA(6, 0, "148mm", "210mm", "湖南泰和医院处方笺");
+                    LODOP.PRINT_INITA(6, 0, "148mm", "210mm", "长沙泰和医院处方笺");
                     LODOP.SET_PRINT_STYLE("FontSize", 9); //字体大小
                     //设置默认打印机
                     LODOP.SET_PRINTER_INDEX(printIndex);
@@ -7169,7 +7169,7 @@ function printYjReq(patientId, times, type, printType) {
                 }
                 setPrint();
                 LODOP = getLodop();
-                LODOP.PRINT_INITA(6, 0, "148mm", "210mm", "湖南泰和医院检查申请单");
+                LODOP.PRINT_INITA(6, 0, "148mm", "210mm", "长沙泰和医院检查申请单");
                 LODOP.SET_PRINT_STYLE("FontSize", 9); //字体大小
                 //设置默认打印机
                 LODOP.SET_PRINTER_INDEX(printIndex);
@@ -7275,7 +7275,7 @@ function printBlRecord(patientId, times, printType) {
             if (res.code == 0) {
                 setPrint();
                 LODOP = getLodop();
-                LODOP.PRINT_INITA(6, 0, "148mm", "210mm", "湖南泰和医院门诊病历");
+                LODOP.PRINT_INITA(6, 0, "148mm", "210mm", "长沙泰和医院门诊病历");
                 LODOP.SET_PRINT_STYLE("FontSize", 9); //字体大小
                 //设置默认打印机
                 LODOP.SET_PRINTER_INDEX(printIndex);
@@ -7428,7 +7428,7 @@ function printZyReq(patientId, printType) {
             if (res.code == 0) {
                 setPrint();
                 LODOP = getLodop();
-                LODOP.PRINT_INITA(6, 0, "148mm", "210mm", "湖南泰和医院入院通知单");
+                LODOP.PRINT_INITA(6, 0, "148mm", "210mm", "长沙泰和医院入院通知单");
                 LODOP.SET_PRINT_STYLE("FontSize", 9); //字体大小
                 //设置默认打印机
                 LODOP.SET_PRINTER_INDEX(printIndex);

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

@@ -678,7 +678,7 @@ function printJyJcReport(printType) {
     }
     setPrint();
     LODOP = getLodop();
-    LODOP.PRINT_INITA(6, 0, "148mm", "210mm", "湖南泰和医院" + title);
+    LODOP.PRINT_INITA(6, 0, "148mm", "210mm", "长沙泰和医院" + title);
     LODOP.SET_PRINT_STYLE("FontSize", 7); //字体大小
     //设置默认打印机
     LODOP.SET_PRINTER_INDEX(printIndex);

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

@@ -299,7 +299,7 @@ function printBlRecord(patientId, times, printType) {
             if (res.code == 0) {
                 setPrint();
                 LODOP = getLodop();
-                LODOP.PRINT_INITA(6, 0, "148mm", "210mm", "湖南泰和医院门诊病历");
+                LODOP.PRINT_INITA(6, 0, "148mm", "210mm", "长沙泰和医院门诊病历");
                 LODOP.SET_PRINT_STYLE("FontSize", 9); //字体大小
                 //设置默认打印机
                 LODOP.SET_PRINTER_INDEX(printIndex);

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

@@ -95,7 +95,7 @@ function inventoryButtonChange(object, realIndex) {
                 }
                 if (res.code == 0) {
                     var roles = res.data.roleIds.split(",");
-                    for (let i = 0; i < roles.length; i++) {
+                    for (var i = 0; i < roles.length; i++) {
                         if(roles[i] == 1 || roles[i] == 3){
                             $("#btn_audit").attr("disabled",false);
                             return;
@@ -298,7 +298,7 @@ function initTbAddRecord() {
             root: "data", repeatitems: false
         },
         ondblClickRow: function(rowid){
-            let record = $("#tb_add_record").getRowData(rowid);
+            var record = $("#tb_add_record").getRowData(rowid);
             $('.sjh').remove();
             getTbAddRecordPrintData(record.drawNo);
             $("#recrodModal").modal("hide");
@@ -342,17 +342,17 @@ function getTbAddRecordPrintData(drawNo) {
                 $("#inventoryNo").html(drawNo);
                 $("#auditDate").html(format(res.data[0].confirmDate,'yyyy-MM-dd HH:mm:ss'));
                 $("#printDate").html(format(new Date(),'yyyy-MM-dd HH:mm:ss'));
-                let html = '';
-                let kindName = '';
-                let xj_lszje = 0;
-                let xj_grzje = 0;
-                let xj_ykzje = 0;
-                let lszje = 0;
-                let grzje = 0;
-                let ykzje = 0;
-                let confirmName = res.confirmName==null?'':res.confirmName;
+                var html = '';
+                var kindName = '';
+                var xj_lszje = 0;
+                var xj_grzje = 0;
+                var xj_ykzje = 0;
+                var lszje = 0;
+                var grzje = 0;
+                var ykzje = 0;
+                var confirmName = res.confirmName==null?'':res.confirmName;
                 for (var i = 0; i < res.data.length; i++) {
-                    let data = res.data[i];
+                    var data = res.data[i];
                     var lsje = data.currStockAmount*data.packRetprice;
                     var grje = data.currStockAmount*data.buyPrice;
                     var ykje = parseFloat((data.currStockAmount-data.stockAmount)*data.packRetprice);
@@ -420,7 +420,7 @@ function getTbAddRecordPrintData(drawNo) {
                     '    </tr>';
                 $("#tj_table").append(html);
                 var date = new Date();
-                tableToExcel('tj_table', '湖南泰和医院药品盘点表('+date.getMonth()+'月)');
+                tableToExcel('tj_table', '长沙泰和医院药品盘点表('+date.getMonth()+'月)');
             } else if (res.code == -1) {
                 new PNotify({
                     title: '错误提示',

src/main/resources/templates/login.html

@@ -34,11 +34,11 @@
         <div class="container">
             <div class="row">
                 <div class="col-sm-8 col-sm-offset-2 text">
-                    <!--<h1><strong>湖南泰和医院</strong>门诊管理系统</h1>-->
+                    <!--<h1><strong>长沙泰和医院</strong>门诊管理系统</h1>-->
                     <h1><strong>泰和云HIS</strong></h1>
                     <div class="description">
                         <p>
-                            湖南泰和医院是一家省级直属三级综合学科医院，医保/农合定点，全国诚信标杆医院
+                            长沙泰和医院是一家省级直属三级综合学科医院，医保/农合定点，全国诚信标杆医院
                             链接至<a href="http://192.168.200.4/"><strong>医院首页</strong></a>，祝您工作愉快
                         </p>
                     </div>

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

@@ -51,7 +51,7 @@
     <!--<div class="col-sm-8 col-sm-8 col-xs-12" style="text-align: left;letter-spacing: 30px;">-->
         <!--<img src="../../thmz/images/taihe-logo3.png"-->
              <!--style="height: 50px;width:50px;float: left;margin-left: 20px;border-radius: 25px;">-->
-        <!--<span style="margin-left: 30px;">湖南泰和医院</span></div>-->
+        <!--<span style="margin-left: 30px;">长沙泰和医院</span></div>-->
     <!--<div class="col-sm-4 col-sm-4 col-xs-12" style="text-align: right;"><i class="fa fa-clock-o">&nbsp;&nbsp;</i><span-->
             <!--id="dateNow"></span></div>-->
 <!--</div>-->

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

@@ -53,7 +53,7 @@
     <div class="col-sm-8 col-sm-8 col-xs-12" style="text-align: left;letter-spacing: 30px;">
         <img src="../../thmz/images/taihe-logo3.png"
              style="height: 50px;width:50px;float: left;margin-left: 20px;border-radius: 25px;">
-        <span style="margin-left: 30px;">湖南泰和医院</span></div>
+        <span style="margin-left: 30px;">长沙泰和医院</span></div>
     <div class="col-sm-4 col-sm-4 col-xs-12" style="text-align: right;"><i class="fa fa-clock-o">&nbsp;&nbsp;</i><span
             id="dateNow"></span></div>
 </div>
@@ -71,9 +71,9 @@
         <div style="height: 100%;">
             <div style="height: calc(100% - 90px);padding-top: 10px;background: white;" id="client_index">
                 <div style="height: 30px;background-color: #C4E0F6;width: calc(100% - 10px);margin-left: 5px;border-radius: 5px;color: black;">
-                    湖南泰和医院简介
+                    长沙泰和医院简介
                 </div>
-                <div style="line-height: 100px;margin-top: 100px;text-indent: 2.8cm;font-size: 40px;">湖南泰和医院是一家省级直属三级综合学科医院，医保/农合定点，全国诚信标杆医院，祝您早日康复，工作愉快！</div>
+                <div style="line-height: 100px;margin-top: 100px;text-indent: 2.8cm;font-size: 40px;">长沙泰和医院是一家省级直属三级综合学科医院，医保/农合定点，全国诚信标杆医院，祝您早日康复，工作愉快！</div>
             </div>
 
             <div style="height: calc(100% - 90px);padding-top: 10px;background: white;" id="client_price" hidden>

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

@@ -53,7 +53,7 @@
     <!--<div class="col-sm-8 col-sm-8 col-xs-12" style="text-align: left;letter-spacing: 30px;">-->
         <!--<img src="../../thmz/images/taihe-logo3.png"-->
              <!--style="height: 50px;width:50px;float: left;margin-left: 20px;border-radius: 25px;">-->
-        <!--<span style="margin-left: 30px;">湖南泰和医院</span></div>-->
+        <!--<span style="margin-left: 30px;">长沙泰和医院</span></div>-->
     <!--<div class="col-sm-4 col-sm-4 col-xs-12" style="text-align: right;"><i class="fa fa-clock-o">&nbsp;&nbsp;</i><span-->
             <!--id="dateNow"></span></div>-->
 <!--</div>-->

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

@@ -1637,12 +1637,12 @@
      style="width:920px;height: calc(100% - 160px);margin:0 auto;border: 1px solid #337ab7;font-size: 13px;padding: 40px 20px 40px 20px;overflow-y: auto; overflow-x:hidden;">
     <div id="report_table_1">
         <div style="position: relative;">
-            <div style="text-align:center;font-weight: 700;">湖南泰和医院</div>
+            <div style="text-align:center;font-weight: 700;">长沙泰和医院</div>
             <div style="float: right;color: red;margin-right: 30px;border: 1px solid red;width: 60px;text-align: center;position: absolute;top: 0px;right: 0px;"
                  id="cfTitle"></div>
         </div>
         <div style="text-align:center;font-weight: 700;">处方笺</div>
-        <!--<h3 style="text-align:center;font-weight: 700;">湖南泰和医院</h3>-->
+        <!--<h3 style="text-align:center;font-weight: 700;">长沙泰和医院</h3>-->
         <!--<h3 style="text-align:center;font-weight: 700;">处方笺</h3>-->
 
         <table class="table table-striped table-bordered" style="border-bottom: 1px solid black;font-size: 13px;">
@@ -1772,7 +1772,7 @@
     <div>
         <div>
             <div style="position: relative;">
-                <div style="text-align:center;font-weight: 700;">湖南泰和医院</div>
+                <div style="text-align:center;font-weight: 700;">长沙泰和医院</div>
                 <div style="text-align:center;font-weight: 700;">检查申请单</div>
             </div>
             <table class="table table-striped table-bordered"
@@ -1860,7 +1860,7 @@
     <div>
         <div>
             <div style="position: relative;">
-                <div style="text-align:center;font-weight: 700;">湖南泰和医院</div>
+                <div style="text-align:center;font-weight: 700;">长沙泰和医院</div>
                 <div style="text-align:center;font-weight: 700;">检验申请单</div>
             </div>
             <table class="table table-striped table-bordered"
@@ -1952,7 +1952,7 @@
     <div>
         <div>
             <div style="position: relative;">
-                <div style="text-align:center;font-weight: 700;">湖南泰和医院</div>
+                <div style="text-align:center;font-weight: 700;">长沙泰和医院</div>
                 <div style="float: right;color: red;margin-right: 30px;border: 1px solid red;width: 60px;text-align: center;position: absolute;top: 0px;right: 0px;"
                      id="firstOrNotTitle"></div>
             </div>

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

@@ -69,7 +69,7 @@
     <div>
         <div>
             <div style="position: relative;">
-                <div style="text-align:center;font-weight: 700;">湖南泰和医院</div>
+                <div style="text-align:center;font-weight: 700;">长沙泰和医院</div>
                 <div style="float: right;color: red;margin-right: 30px;border: 1px solid red;width: 60px;text-align: center;position: absolute;top: 0px;right: 0px;"
                      id="firstOrNotTitle"></div>
             </div>

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

@@ -97,7 +97,7 @@
                     <div id="report_table_1">
                         <table id="tj_table" class="table table-striped table-bordered" style="margin-top: 0px;">
                             <tr style="font-weight: 700;background-color: #EBEBE4">
-                                <td colspan="13" style="font-size: 21px;text-align: center;border: transparent !important;">湖南泰和医院药品盘点表</td>
+                                <td colspan="13" style="font-size: 21px;text-align: center;border: transparent !important;">长沙泰和医院药品盘点表</td>
                             </tr>
                             <tr style="font-weight: 700;background-color: #EBEBE4">
                                 <td colspan="3" style="text-align: right;border: transparent !important;">库房：<span id="groupNo"></span></td>

src/main/resources/templates/zy/accepting.html

@@ -331,7 +331,7 @@
 <div id="report_table" class="in hide"
      style="width:192mm;height:97mm;margin:0 auto;border: 1px solid #337ab7;font-size: 10px;padding-top: 5mm;overflow-y: auto; overflow-x:hidden;">
     <div id="report_table_1">
-        <div style="text-align:center;font-weight: 700;padding-top: -8mm">湖南泰和医院</div>
+        <div style="text-align:center;font-weight: 700;padding-top: -8mm">长沙泰和医院</div>
         <div style="text-align:center;font-weight: 700;margin-top: 5px;">预交金收据</div>
         <!-- <div style="margin-top: 20px;"></div>-->
         <div>

src/main/resources/templates/zy/zy_daily.html

@@ -60,7 +60,7 @@
             <div id="report_table" class="in"
                  style="width:920px;height: calc(100% - 160px);margin:0 auto;border: 1px solid #337ab7;font-size: 16px;padding: 40px 20px 40px 20px;overflow-y: auto; overflow-x:hidden;">
                 <div id="report_table_1">
-                    <h2 style="text-align:center;font-weight: 700;">湖南泰和医院住院结账统计日报表</h2>
+                    <h2 style="text-align:center;font-weight: 700;">长沙泰和医院住院结账统计日报表</h2>
                     <div style="margin-top: 20px;">
                         <span>收费员：</span><span id="username"></span><span
                             style="margin-left: 120px;">工号：</span><span id="userIdCode"></span><span