From 5481df324518ffe9bed817a7064daebd9f951d57 Mon Sep 17 00:00:00 2001 From: linjj <850658129@qq.com> Date: Wed, 16 Jul 2025 12:32:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BD=AE=E5=B7=9E=E4=BA=BA=E5=8C=BB=E5=B8=B8?= =?UTF-8?q?=E7=94=A8=E6=9F=A5=E8=AF=A2=E4=B8=8B=E8=BD=BDPDF,=E4=B8=8B?= =?UTF-8?q?=E8=BD=BDPDF=E6=97=B6=E8=A7=84=E8=8C=83=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templateSearch/TemplateSearchController.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java index 08e4358..5dfcf4e 100644 --- a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java +++ b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java @@ -5,10 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.emr.annotation.OptionalLog; import com.emr.controller.FormTokenFlagUtil; import com.emr.controller.JAXDynamicClientFactory; -import com.emr.dao.Archive_DetailMapper; -import com.emr.dao.CommomMapper; -import com.emr.dao.EmrComomSetMapper; -import com.emr.dao.Emr_DictionaryMapper; +import com.emr.dao.*; import com.emr.dao.approve.Emr_Apply_ApproveMapper; import com.emr.dao.commomSearch.ScanPathMapper; import com.emr.dao.emrPdfWaterSet.EmrPdfWaterSetMapper; @@ -121,6 +118,8 @@ public class TemplateSearchController { private CommomService commomService; @Autowired private Archive_DetailMapper archiveDetailMapper; + @Autowired + private Archive_MasterMapper archiveMasterMapper; @Value("${export_pdf_hospital_info}") private String hospitaInfo; @@ -1583,6 +1582,8 @@ public class TemplateSearchController { EmrPdfWaterSet emrPdfWaterSet1 = commomService.getEmrPdfWaterSet(emrPdfWaterSet); imgToPdfUtil.imageToPdf(response, scanPathVos, pdfName, emrPdfWaterSet,emrPdfWaterSet1); }else { + //查询患者信息 + List merInfo = scanPathMapper.selectFilaname(patientIds); List archiveDetails = archiveDetailMapper.selectPdfPathByPatient(patientIds, assortIds); if (null != archiveDetails && !archiveDetails.isEmpty()) { for (Archive_Detail detail : archiveDetails) { @@ -1591,8 +1592,11 @@ public class TemplateSearchController { filePaths.add(pdfPath); } } - SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMdd"); - String filename = fmt.format(new Date()); + SimpleDateFormat originalFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat targetFormat = new SimpleDateFormat("yyyyMMdd"); + Date date = originalFormat.parse(merInfo.get(0).getDisDate()); + String formattedDate = targetFormat.format(date); + String filename = hospitaInfo+ "_" +merInfo.get(0).getInpatientNo()+ "_" + formattedDate.format(formattedDate); Jpg2PdfUtil.mulFile2One3(response, filePaths, filename); } }