From 95c46d16732888f184e1431e29909fcec51a2231 Mon Sep 17 00:00:00 2001 From: leijx <1477272687@qq.com> Date: Mon, 22 Jun 2020 23:56:16 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=AD=BE=E6=94=B6=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=B9=B3=E5=8F=B0=E6=9C=8D=E5=8A=A1=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=EF=BC=9B=202=E3=80=81=E8=B0=83=E6=95=B4=E7=94=B5?= =?UTF-8?q?=E5=AD=90=E7=97=85=E5=8E=86=E6=96=B0=E8=80=81=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=B8=8B=E8=BD=BD=E6=96=B9=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=96=87=E4=BB=B6=E5=91=BD=E5=90=8D=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ann/controller/TestController.java | 10 ++-- .../com/ann/entity/filing/ArchiveDetail.java | 2 + .../com/ann/entity/filing/dto/MessageDto.java | 4 ++ .../com/ann/service/ArchiveDetailService.java | 1 - .../impl/ArchiveDetailServiceImpl.java | 12 ---- .../com/ann/service/impl/QueueService.java | 55 +++++++++---------- .../java/com/ann/utils/DownloadUtils.java | 2 +- .../java/com/ann/utils/WebServiceUtils.java | 2 +- 8 files changed, 40 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/ann/controller/TestController.java b/src/main/java/com/ann/controller/TestController.java index a1b02e0..3f4c267 100644 --- a/src/main/java/com/ann/controller/TestController.java +++ b/src/main/java/com/ann/controller/TestController.java @@ -99,11 +99,11 @@ public class TestController { return "我是测试ftp的~~~~"; } - @RequestMapping("/deleteDetail") - public String deleteDetail() throws Exception{ - archiveDetailService.delete(); - return "成功"; - } +// @RequestMapping("/deleteDetail") +// public String deleteDetail() throws Exception{ +// archiveDetailService.delete(); +// return "成功"; +// } @ResponseBody @RequestMapping("/test") diff --git a/src/main/java/com/ann/entity/filing/ArchiveDetail.java b/src/main/java/com/ann/entity/filing/ArchiveDetail.java index 1c97e6d..2e36981 100644 --- a/src/main/java/com/ann/entity/filing/ArchiveDetail.java +++ b/src/main/java/com/ann/entity/filing/ArchiveDetail.java @@ -61,6 +61,7 @@ public class ArchiveDetail { this.applyId = applyId; } + // 普通下载 public ArchiveDetail(String masterID, Date upLoadDateTime, String assortID, String source, String applyId, String title,Integer i) { this.masterID = masterID; this.upLoadDateTime = upLoadDateTime; @@ -70,6 +71,7 @@ public class ArchiveDetail { this.title = title; } + //扫描下载 public ArchiveDetail(String masterID, Date upLoadDateTime, String assortID, String source, String applyId, String pdfPath) { this.masterID = masterID; this.upLoadDateTime = upLoadDateTime; diff --git a/src/main/java/com/ann/entity/filing/dto/MessageDto.java b/src/main/java/com/ann/entity/filing/dto/MessageDto.java index 7fc8962..4fca018 100644 --- a/src/main/java/com/ann/entity/filing/dto/MessageDto.java +++ b/src/main/java/com/ann/entity/filing/dto/MessageDto.java @@ -51,6 +51,10 @@ public class MessageDto { // 2019-11-28 新增三级标题 private String detailType; + //20200609 0是老数据 1是新数据 + private String isOld; + + public MessageDto() { } diff --git a/src/main/java/com/ann/service/ArchiveDetailService.java b/src/main/java/com/ann/service/ArchiveDetailService.java index 3a23be5..9d92840 100644 --- a/src/main/java/com/ann/service/ArchiveDetailService.java +++ b/src/main/java/com/ann/service/ArchiveDetailService.java @@ -14,7 +14,6 @@ public interface ArchiveDetailService { public void delete(String id) throws Exception; - public void delete() throws Exception; public ArchiveDetail isExit(String id, String type, String source, String applyId) throws Exception; diff --git a/src/main/java/com/ann/service/impl/ArchiveDetailServiceImpl.java b/src/main/java/com/ann/service/impl/ArchiveDetailServiceImpl.java index e753650..a8800b9 100644 --- a/src/main/java/com/ann/service/impl/ArchiveDetailServiceImpl.java +++ b/src/main/java/com/ann/service/impl/ArchiveDetailServiceImpl.java @@ -35,18 +35,6 @@ public class ArchiveDetailServiceImpl implements ArchiveDetailService { archiveDetailRepository.deleteById(id); } - @Override - public void delete() throws Exception { - List all = archiveDetail1Repository.findAllHaha(); - int i = 0; - for (ArchiveDetail1 a : all) { - if (a.getPdfPath() != null) { - i = FileUtils.deleteImageFile1(new File(a.getPdfPath()), i); - } - } - System.out.println("一共有:" + all.size()); - System.out.println("一共删除:" + i); - } @Override public ArchiveDetail isExit(String id, String type, String source, String applyId) throws Exception { diff --git a/src/main/java/com/ann/service/impl/QueueService.java b/src/main/java/com/ann/service/impl/QueueService.java index c718a85..539a9aa 100644 --- a/src/main/java/com/ann/service/impl/QueueService.java +++ b/src/main/java/com/ann/service/impl/QueueService.java @@ -46,18 +46,15 @@ public class QueueService { ArchiveDetail archiveDetail = null; try { // 解析内容 - String contentJson = messageSubordinate.getContentJson(); - MessageLog messageLog = JSON.parseObject(contentJson, MessageLog.class); - + MessageLog messageLog = JSON.parseObject(messageSubordinate.getContentJson(), MessageLog.class); if (messageLog != null) { String outJson = messageLog.getOutJson(); if (outJson != null) { MessageDto messageDto = JSON.parseObject(outJson, MessageDto.class); - if (messageDto.getSource().equals(InterfaceName.NURSE_DATA) && messageDto.getReportAddress().endsWith(".jpg") - || messageDto.getSource().equals(InterfaceName.NURSE_DATA) && messageDto.getReportAddress().endsWith(".JPG") ) { // 护理记录 + if (messageDto.getSource().equals(InterfaceName.NURSE_DATA) && (messageDto.getReportAddress().endsWith(".jpg") + || messageDto.getReportAddress().endsWith(".JPG") )){ messageSubordinate.setRemark("住院号:" + messageDto.getInpNo() + "pdf路径为空(可能出现下载问题)。。。"); } else { - // 根据这里的值 去找table5 ArchiveMaster archiveMaster = archiveMasterService.findByInpNoAndVisitIdAndIsValid(messageDto.getInpNo(), messageDto.getVisitId()); if (archiveMaster != null) { if(!Objects.equals(messageDto.getType(),AliasName.PATHOLOGY_REPORT)){ @@ -72,20 +69,8 @@ public class QueueService { String address = messageDto.getReportAddress(); if (address != null && (!address.equals(""))) { - //------------------------------------------时间改成java8新特性的localDate - //医生 护理单独做处理 - if(messageDto.getSource().equals(InterfaceName.NURSE_DATA) || messageDto.getSource().equals(InterfaceName.DOCTOR_DATA)){ - if(messageDto.getSource().equals(InterfaceName.NURSE_DATA)){ - if(archiveMaster.getEmrNurseCmt() == null || archiveMaster.getEmrNurseCmt().equals("")){ - archiveMaster.setEmrNurseCmt("提交"); - archiveMasterService.save(archiveMaster); - } - }else{ - if(archiveMaster.getEmrDoctorCmt() == null || archiveMaster.getEmrDoctorCmt().equals("")){ - archiveMaster.setEmrDoctorCmt("提交"); - archiveMasterService.save(archiveMaster); - } - } + // 如果是老数据 + if(Objects.equals(messageDto.getIsOld(),"0")){ archiveDetail = new ArchiveDetail(archiveMaster.getId(), new Date(), messageDto.getType(), messageDto.getSource(), messageDto.getApplyId(),messageDto.getDetailType(),1); archiveDetailService.save(archiveDetail); }else{ @@ -99,21 +84,35 @@ public class QueueService { } String pdfPath = null; String emrPath = ""; - //判断是否是电子病历 - if (messageDto.getSource().equals(InterfaceName.NURSE_DATA)) { // 护理记录 - String a = address.substring(0, address.indexOf(".pdf")); - emrPath = messageDto.getType() + "~" + (a.substring(a.lastIndexOf("_") + 1, a.length())) + "~"; - //emrPath = (messageDto.getApplyId().substring(0, messageDto.getApplyId().indexOf(".pdf"))) + "~" + (a.substring(a.lastIndexOf("_") + 1, a.length())) + "~"; - } else if (messageDto.getSource().equals(InterfaceName.DOCTOR_DATA)) { // 护理记录 - if (messageDto.getCaptionDateTime() != null && (!messageDto.getCaptionDateTime().equals(""))) { - emrPath = messageDto.getType() + "~" + messageDto.getCaptionDateTime() + "~"; + + if(messageDto.getSource().equals(InterfaceName.NURSE_DATA)){ + //医生 护理单独做处理 + if(archiveMaster.getEmrNurseCmt() == null){ + archiveMaster.setEmrNurseCmt("提交"); + archiveMasterService.save(archiveMaster); } + String a = ""; + if(messageDto.getApplyId().lastIndexOf("_") != -1){ + a = messageDto.getApplyId().substring(0, messageDto.getApplyId().indexOf(".pdf")); + }else{ + a = address.substring(0, address.lastIndexOf("_")); + } + emrPath = messageDto.getType() + "~" + (a.substring(a.lastIndexOf("_") + 1, a.length())) + "~"; + + } else if(messageDto.getSource().equals(InterfaceName.DOCTOR_DATA)){ + //护士 护理单独做处理 + if(archiveMaster.getEmrDoctorCmt() == null){ + archiveMaster.setEmrDoctorCmt("提交"); + archiveMasterService.save(archiveMaster); + } + emrPath = messageDto.getType() + "~" + messageDto.getCaptionDateTime() + "~"; }else{ // 20200518 给重症系统的文件排序 if(messageDto.getType().equals(AliasName.ICU_REPORT)){ emrPath = messageDto.getDetailType() + "~" + messageDto.getCaptionDateTime() + "~"; } } + File pdfFile = FileUtils.createFile("pdfs", messageDto.getInpNo(), messageDto.getVisitId(), archiveDetail.getId(), emrPath); if (pdfFile != null) { if (address.endsWith(".pdf") || address.endsWith(".PDF")) { diff --git a/src/main/java/com/ann/utils/DownloadUtils.java b/src/main/java/com/ann/utils/DownloadUtils.java index ceb3ceb..fff61cd 100644 --- a/src/main/java/com/ann/utils/DownloadUtils.java +++ b/src/main/java/com/ann/utils/DownloadUtils.java @@ -44,7 +44,7 @@ public class DownloadUtils { url = new URL(s1 +URLEncoder.encode(s2, "utf-8")); // url = new URL(urlStr); - HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + HttpURLConnection conn = (HttpURLConnection)url.openConnection(); //设置超时间为5秒 conn.setConnectTimeout(5 * 1000); //防止屏蔽程序抓取而返回403错误 diff --git a/src/main/java/com/ann/utils/WebServiceUtils.java b/src/main/java/com/ann/utils/WebServiceUtils.java index b4da046..55eeaf4 100644 --- a/src/main/java/com/ann/utils/WebServiceUtils.java +++ b/src/main/java/com/ann/utils/WebServiceUtils.java @@ -23,7 +23,7 @@ public class WebServiceUtils { public static Object[] connectEMR(String content) throws Exception { JaxWsDynamicClientFactory dcf = JaxWsDynamicClientFactory.newInstance(); - Client client = dcf.createClient("http://10.6.0.151:8089/SignWebService.asmx?wsdl"); + Client client = dcf.createClient("http://10.6.0.170/csp/jhip/JHIP.MRA.BS.MedicalRecordsQueryBS.cls?wsdl"); Object[] objects = new Object[0]; try { // invoke("方法名",参数1,参数2,参数3....);