diff --git a/src/main/java/com/ann/demo/service/AnalysisService.java b/src/main/java/com/ann/demo/service/AnalysisService.java index f9c151e..002a78e 100644 --- a/src/main/java/com/ann/demo/service/AnalysisService.java +++ b/src/main/java/com/ann/demo/service/AnalysisService.java @@ -80,7 +80,7 @@ public class AnalysisService { MessageDto messageDto = XMLUtils.xpathToBean(message, tClass, parameter); if (messageDto != null) { String textContentTemp = null; - if(Objects.equals(messageDto.getType(),AliasName.PETCT_REPORT)){ + if(StringUtils.isEmpty(messageDto.getVisitId()) && Objects.equals(messageDto.getType(),AliasName.PETCT_REPORT)){ //如果是pet-ct报告 那么还要查出住院次数 UltrasonicReport ultrasonicReport = JSON.parseObject(messageDto.getObject().toString(), UltrasonicReport.class); String authorReportTime = ultrasonicReport.getAuthorReportTime(); @@ -90,13 +90,13 @@ public class AnalysisService { messageDto.setVisitId(visitId); } archiveMasterId = messageService.getArchiveMasterId(messageDto.getInpNo(), messageDto.getVisitId(),messageDto.getPatientId()); - if(StringUtils.isEmpty(archiveMasterId) && "119".equals(messageDto.getType())){ + if(StringUtils.isEmpty(archiveMasterId) && "125".equals(messageDto.getType())){ archiveMasterId = messageService.getArchiveMasterId(messageDto.getInpNo(),messageDto.getPatientId()); } if(archiveMasterId != null){ if (Objects.equals(messageDto.getEntity(), ExamApply.class.getName())) { // 申请单 //设置骨密度的需要值,存进extend_value字段里 - if("119".equals(messageDto.getType())){ + if("125".equals(messageDto.getType())){ setExtendValue(message, archiveMasterId); } ExamApply examApply = JSON.parseObject(messageDto.getObject().toString(), ExamApply.class); @@ -148,15 +148,21 @@ public class AnalysisService { private void setExtendValue(String message,String masterId) { XmlUtil xmlUtil = XmlUtil.of(message); Node node = xmlUtil.getNode("/POOR_IN200901UV/controlActProcess/subject/placerGroup/component2/observationRequest/component2/observationRequest/AccessionNo/@value"); - String textContent = node.getTextContent(); - MessageExtend messageExtend = new MessageExtend(); - messageExtend.setMasterId(masterId); - messageExtend.setType(1); - messageExtend.setExtendValue(textContent); - messageExtendRepository.save(messageExtend); + if(null != node) { + String textContent = node.getTextContent(); + if (!StringUtils.isEmpty(textContent) && textContent.startsWith("OT")) { + MessageExtend messageExtend = new MessageExtend(); + messageExtend.setMasterId(masterId); + messageExtend.setType(1); + messageExtend.setExtendValue(textContent); + messageExtendRepository.save(messageExtend); + } + } } + + private String changeApply(ExamApply examApply,String interfaceName) throws Exception{ String textContent = null; ExamApply examApplyTemp = examApplyService.findExamApply(examApply.getApplyId());