From 5817404f72c5da45006f39082bd0237b884f1c4b Mon Sep 17 00:00:00 2001 From: Godblessyou <824612544@qq.com> Date: Wed, 16 Jul 2025 11:38:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=962.0=E6=A0=87=E5=87=86?= =?UTF-8?q?=E7=89=88=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FontShowRecordController.java | 49 +++++++++++++++++++ .../TemplateSearchController.java | 6 +-- .../java/com/emr/dao/Zd_AssortMapper.java | 4 +- .../java/com/emr/service/CommomService.java | 4 +- src/main/java/com/emr/util/img2PdfUtil.java | 3 ++ src/main/resources/config/config.properties | 2 +- src/main/resources/mapper/Zd_AssortMapper.xml | 5 +- .../recordManage/commomSearch/commomListqf.js | 30 ------------ .../commomSearch/showRecordIframeBlood.js | 49 ------------------- src/main/webapp/static/pdfjs/web/viewer2.html | 18 +++++-- 10 files changed, 77 insertions(+), 93 deletions(-) diff --git a/src/main/java/com/emr/controller/FontShowRecordController.java b/src/main/java/com/emr/controller/FontShowRecordController.java index 1d3c7dd..42be6dd 100644 --- a/src/main/java/com/emr/controller/FontShowRecordController.java +++ b/src/main/java/com/emr/controller/FontShowRecordController.java @@ -1097,4 +1097,53 @@ public class FontShowRecordController { } return "recordManage/commomSearch/showRecord174"; } + + /*@RequestMapping("sendFileManage") + public String sendFileManage(String patientId, Model model, HttpServletRequest request) throws Exception { + //创建连接工厂 + JAXDynamicClientFactory dcf = JAXDynamicClientFactory.newInstance(); + //创建客户端 + Object[] objects = new Object[0]; + Client client = null; + try { + //http://172.16.60.202:9083/HtMongoDBWebServiceInterface/services/Manage?wsdl + client = dcf.createClient("http://172.16.60.202:9083/HtMongoDBWebServiceInterface/services/Manage?wsdl"); + + // 构造 XML 参数字符串 + String xmlParam = "\n" + + "\n" + + " Js\n" + + " 嘉时采集资料\n" + + " 17.1\n" + + " 费用结算清单\n" + + " 患者EMPI\n" + + " 患者PID\n" + + " 患者ID\n" + + " 患者住院号、门诊号\n" + + " 报告来源\n" + + " 文档流水号（唯一）\n" + + " 报告名称、文档名称（唯一）\n" + + " 报告PDF转base64\n" + + " 报告处理类型（CRUD）\n" + + " 应传报告数\n" + + " 实传报告数\n" + + " 关联申请单号\n" + + " 报告时间（不是上传时间、当前时间）\n" + + "排序码\n" + + "< relOutRecSn>\n" + + ""; + + // 调用 WebService 方法，并传递 XML 参数 + Object[] response = client.invoke("reportFileManage", xmlParam); + // 处理返回结果 + System.out.println("Response: " + response[0]); + + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (null != client) { + client.destroy(); + } + } + }*/ } diff --git a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java index 90a625d..7e6d46f 100644 --- a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java +++ b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java @@ -1702,7 +1702,7 @@ public class TemplateSearchController { //批量添加打印记录 printOrDownLoadInfoService.SimpleInsert(scanPathVos, typeId, Short.valueOf("1")); //调用湘雅附二病历复印打印状态同步接口 - this.MedicalPrintSyncPrintStatusAction(patientIds , printDate); + //this.MedicalPrintSyncPrintStatusAction(patientIds , printDate); } } catch (Exception e) { ExceptionPrintUtil.printException(e); @@ -1719,7 +1719,7 @@ public class TemplateSearchController { JAXDynamicClientFactory dcf = JAXDynamicClientFactory.newInstance(); //创建客户端 Object[] objects; - Client client = dcf.createClient("http://172.16.198.250:13023/openapi/health"); + Client client = dcf.createClient("http://172.16.198.250:13023/services/ws"); // http://172.16.198.250:13023/services/ws http://172.16.198.250:13023/openapi/health //合作方密钥 String partnerKey = "53fd4f5ff132528e2e071baeeb3f99a2"; @@ -1753,7 +1753,7 @@ public class TemplateSearchController { // 1、创建document对象 Document document = DocumentHelper.createDocument(); // 2、创建根节点rss - Element requestElement = document.addElement("Request"); + Element requestElement = document.addElement("request"); requestElement.addElement("serviceCode").setText("MedicalPrintSyncPrintStatusAction"); requestElement.addElement("partnerId").setText("XYEYYHIS"); requestElement.addElement("timeStamp").setText(printDate); diff --git a/src/main/java/com/emr/dao/Zd_AssortMapper.java b/src/main/java/com/emr/dao/Zd_AssortMapper.java index c976abe..48ce8cb 100644 --- a/src/main/java/com/emr/dao/Zd_AssortMapper.java +++ b/src/main/java/com/emr/dao/Zd_AssortMapper.java @@ -44,8 +44,8 @@ public interface Zd_AssortMapper { /** * 根据分类名称查询分类对象 - * @param assortName + * @param patientId * @return */ - Zd_Assort getZdAssortByName(@Param("assortName") String assortName); + Zd_Assort getZdAssortByName(@Param("patientId") String patientId); } \ No newline at end of file diff --git a/src/main/java/com/emr/service/CommomService.java b/src/main/java/com/emr/service/CommomService.java index 594f8fa..6fd0585 100644 --- a/src/main/java/com/emr/service/CommomService.java +++ b/src/main/java/com/emr/service/CommomService.java @@ -1245,8 +1245,6 @@ public class CommomService { //定义导出异常病案号，出院日期实体对象 ExportInpVo exportInpVo = null; - Zd_Assort zd_assort = zd_assortMapper.getZdAssortByName("费用"); - if (pdfNameList != null && pdfNameList.size() > 0) { //病案号 String inpatientNo = ""; @@ -1289,6 +1287,8 @@ public class CommomService { //pdf转jpg图片生成到指定路徑 List picNameList = Pdf2ImgUtil.pdfToPic(saveFileName, pdfName, "jpg", commomVo.getFilePath()); + Zd_Assort zd_assort = zd_assortMapper.getZdAssortByName(commomVo.getPatientId()); + if (picNameList != null && picNameList.size() > 0) { List insertList = new ArrayList<>(); T_Scan_Assort t_scan_assort; diff --git a/src/main/java/com/emr/util/img2PdfUtil.java b/src/main/java/com/emr/util/img2PdfUtil.java index ca5fb21..029c6d9 100644 --- a/src/main/java/com/emr/util/img2PdfUtil.java +++ b/src/main/java/com/emr/util/img2PdfUtil.java @@ -478,6 +478,9 @@ public class img2PdfUtil { img.setAlignment(Image.ALIGN_CENTER); img.scalePercent(percent); + // 新增页面 + document.newPage(); // 新增页面 + //添加图像 document.add(img); if (bufferedImage != null){ diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index d37133d..bda5c8a 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -45,7 +45,7 @@ applyApproveFlag =0 #//????? initialization =0 -export_pdf_hospital_info = \u5e7f\u4e1c\u7701\u005f\u6e5b\u6c5f\u5e02\u005f\u9042\u6eaa\u53bf\u4eba\u6c11\u533b\u9662 +export_pdf_hospital_info = \u5e7f\u4e1c\u7701\u005f\u5e7f\u5dde\u5e02\u5929\u6cb3\u533a\u4eba\u6c11\u533b\u9662 #\u5e7f\u4e1c\u7701\u005f\u6e5b\u6c5f\u5e02\u005f\u9042\u6eaa\u53bf\u4eba\u6c11\u533b\u9662 ?? #\u5e7f\u4e1c\u7701\u005f\u5e7f\u5dde\u5e02\u5929\u6cb3\u533a\u4eba\u6c11\u533b\u9662 ?? diff --git a/src/main/resources/mapper/Zd_AssortMapper.xml b/src/main/resources/mapper/Zd_AssortMapper.xml index 4b29432..5dc435c 100644 --- a/src/main/resources/mapper/Zd_AssortMapper.xml +++ b/src/main/resources/mapper/Zd_AssortMapper.xml @@ -157,6 +157,9 @@ select * from emr_type \ No newline at end of file diff --git a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js index 052983f..6feb45f 100644 --- a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js +++ b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js @@ -361,36 +361,6 @@ function getSql() { if(!isEmpty(dataSource)){ if(dataSource == 6){ name = 'data_source'; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - whereNames += "len(commomtable.inpatient_no) > 10 AND "; }else{ name = 'data_source'; diff --git a/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js b/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js index 9e34739..04e32b7 100644 --- a/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js +++ b/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js @@ -147,55 +147,6 @@ function onloadPdfMethod() { //加载pdf按钮功能 function onloadPdf(scanPages, sources) { - /*var batchSize = 10; // 每批处理10个PDF文件 - var scanPagesArray = scanPages.split(','); - var sourcesArray = sources.split(','); - var totalFiles = scanPagesArray.length; - var batches = Math.ceil(totalFiles / batchSize); - function processBatch(batchIndex){ - var start = batchIndex * batchSize; - var end = Math.min(start + batchSize, totalFiles); - var batchScanPages = scanPagesArray.slice(start, end) + ""; - var batchSources = sourcesArray.slice(start, end) + ""; - - $("#iframeLoad").val(""); - $("#printPicLoaded").val(""); - var patientId = $("#patientId").val(); - //根目录字段识别名称 - var flag = parent.$("#flag").val(); - $.ajax({ - type: 'post', - url: path + "/commom/showRecordContentBlood", - data: { - patientId: patientId, - scanPages: batchScanPages, - flag: flag, - sources: batchSources, - batchIndex: batchIndex - }, - datType: 'json', - success: function (data) { - if (data.code == 0) { - var str = path + "/commom/getRecordContentBlood?patientId=" + patientId + "&batchIndex=" + batchIndex; - if (sources.includes("99") ||sources.includes("服务") ||sources.includes("null")||sources.includes("pacs")||sources.includes("扫描上传")) { - $("#iframe1").attr("src", path + "/static/pdfjs/web/viewer.html?file=" + encodeURIComponent(str)) - } else { - $("#iframe1").attr("src", path + "/static/pdfjs/web/viewer2.html?file=" + encodeURIComponent(str)) - var rootPaths = parent.$("#rootPaths").val(); - var print = $("#print").val(); - if (print == 1) { - selectPrintPic(patientId, rootPaths, scanPages, sources); - } - } - } - } - }) - } - // 处理每个批次 - for (var i = 0; i < batches; i++) { - processBatch(i); - }*/ - $("#iframeLoad").val(""); $("#printPicLoaded").val(""); var patientId = $("#patientId").val(); diff --git a/src/main/webapp/static/pdfjs/web/viewer2.html b/src/main/webapp/static/pdfjs/web/viewer2.html index 316a0b6..6644876 100644 --- a/src/main/webapp/static/pdfjs/web/viewer2.html +++ b/src/main/webapp/static/pdfjs/web/viewer2.html @@ -97,6 +97,16 @@ http://sourceforge.net/adobe/cmap/wiki/License/ opacity: 1; } + .a4-image { + display: block; + width: 90vw; + height: auto; + max-height: 90vh; + object-fit: contain; + margin: 10px auto; + page-break-after: auto; + } + /* 设置打印时的样式 */ @media print { body { @@ -113,10 +123,9 @@ http://sourceforge.net/adobe/cmap/wiki/License/ } .a4-image { - max-width: 100%; /* 图像最大宽度为容器宽度 */ - max-height: 100%; /* 图像最大高度为容器高度 */ - height: auto; /* 保持图像比例 */ - width: auto; /* 保持图像比例 */ + width: 850px !important; + height: 1190px !important; + page-break-after: always; } } @@ -490,7 +499,6 @@ http://sourceforge.net/adobe/cmap/wiki/License/ height: 100%; width: 100%; z-index: 9999999; - display: block; text-align: center; background-color: rgba(0, 0, 0, 0.5);