检查报告 文件唯一号修改

广东省中医_gdszy
wyb 2 years ago
parent 145705e82f
commit 119e2bbfdd

@ -635,8 +635,7 @@ public class ReportJob {
ReportDto reportDto = new ReportDto(); ReportDto reportDto = new ReportDto();
reportDto.setAdmisstimes(tBasic.getAdmissTimes()); reportDto.setAdmisstimes(tBasic.getAdmissTimes());
reportDto.setInpatientNo(tBasic.getInpatientNo()); reportDto.setInpatientNo(tBasic.getInpatientNo());
// 确定报告唯一 报告单号+申请单号
reportDto.setSerialnum(examReportSn + requestSn);
reportDto.setFileTitle(reportName); reportDto.setFileTitle(reportName);
reportDto.setVisitSn(visitSn); reportDto.setVisitSn(visitSn);
reportDto.setPatientSn(patientSn); reportDto.setPatientSn(patientSn);
@ -649,6 +648,8 @@ public class ReportJob {
if (Func.isBlank(base64)) { if (Func.isBlank(base64)) {
continue; continue;
} }
// 确定报告唯一 报告单号+申请单号
reportDto.setSerialnum(split[0]);
String url = saveBase64(base64); String url = saveBase64(base64);
reportDto.setDownUrl(url); reportDto.setDownUrl(url);
reportDto.setDowntype(5); reportDto.setDowntype(5);

@ -66,7 +66,7 @@ public class HIP1008InspectionReportAdditionHandler implements WebserviceReceive
} }
if (sdRyReportHandledConfig.isFetchBase64(sender)) { if (sdRyReportHandledConfig.isFetchBase64(sender)) {
// 过程很长保存队列job慢慢消费 // 过程很长保存队列job慢慢消费
redisOps.lPush(FetchPacsBase64Job.FETCH_PACS_BASE64_QUEUE_HIP1008,receiveMessage); redisOps.lPush(FetchPacsBase64Job.FETCH_PACS_BASE64_QUEUE_HIP1008, receiveMessage);
return insertSuccess(msgId, sender, receiver); return insertSuccess(msgId, sender, receiver);
} }
reportService.report(reportDto); reportService.report(reportDto);
@ -114,8 +114,8 @@ public class HIP1008InspectionReportAdditionHandler implements WebserviceReceive
ReportDto reportDto = new ReportDto(); ReportDto reportDto = new ReportDto();
reportDto.setAdmisstimes(admissTimes); reportDto.setAdmisstimes(admissTimes);
reportDto.setInpatientNo(inpatientNo); reportDto.setInpatientNo(inpatientNo);
// 确定报告唯一 报告单号+申请单号 // 确定报告唯一 报告单号+申请单号,如果报告单号带下划线是合并报告,取报告单号下划线前的
reportDto.setSerialnum(examReportSn + requestSn); String serialnum = examReportSn + requestSn;
reportDto.setFileTitle(reportName); reportDto.setFileTitle(reportName);
reportDto.setVisitSn(visitSn); reportDto.setVisitSn(visitSn);
reportDto.setPatientSn(patientSn); reportDto.setPatientSn(patientSn);
@ -128,6 +128,11 @@ public class HIP1008InspectionReportAdditionHandler implements WebserviceReceive
if (Func.isBlank(base64)) { if (Func.isBlank(base64)) {
return null; return null;
} }
// 如果报告单号带下划线是合并报告,取报告单号下划线前的
if (examReportSn.contains("_")) {
serialnum = split[0];
}
reportDto.setSerialnum(serialnum);
String url = reportJob.saveBase64(base64); String url = reportJob.saveBase64(base64);
reportDto.setDownUrl(url); reportDto.setDownUrl(url);
reportDto.setDowntype(5); reportDto.setDowntype(5);
@ -160,6 +165,11 @@ public class HIP1008InspectionReportAdditionHandler implements WebserviceReceive
Node eafNoNode = inspectionInsertXmlUtil.getNode("/POOR_HIP1008/controlActProcess/subject/recordTarget/patientRole/id[@root='2.16.156.10011.1.24']/@extension"); Node eafNoNode = inspectionInsertXmlUtil.getNode("/POOR_HIP1008/controlActProcess/subject/recordTarget/patientRole/id[@root='2.16.156.10011.1.24']/@extension");
String eafNo = eafNoNode.getNodeValue(); String eafNo = eafNoNode.getNodeValue();
String serialnum = reportFlag + "@" + eafNo; String serialnum = reportFlag + "@" + eafNo;
// 如果报告单号带下划线是合并报告,取报告单号下划线前的
if (reportFlag.contains("_")) {
String[] split = reportFlag.split("_");
serialnum = split[0];
}
// Node assortIdNode = inspectionInsertXmlUtil.getNode("/POOR_HIP1008/controlActProcess/subject/component/structuredBody/component[@displayName='检查报告']/section/entry[@displayName='检查类型']/observation/code/@displayName"); // Node assortIdNode = inspectionInsertXmlUtil.getNode("/POOR_HIP1008/controlActProcess/subject/component/structuredBody/component[@displayName='检查报告']/section/entry[@displayName='检查类型']/observation/code/@displayName");
// String assortId = assortIdNode.getNodeValue(); // String assortId = assortIdNode.getNodeValue();

@ -66,7 +66,7 @@ public class HIP1009InspectionReportUpdatesHandler implements WebserviceReceiveS
} }
if (sdRyReportHandledConfig.isFetchBase64(sender)) { if (sdRyReportHandledConfig.isFetchBase64(sender)) {
// 过程很长保存队列job慢慢消费 // 过程很长保存队列job慢慢消费
redisOps.lPush(FetchPacsBase64Job.FETCH_PACS_BASE64_QUEUE_HIP1009,receiveMessage); redisOps.lPush(FetchPacsBase64Job.FETCH_PACS_BASE64_QUEUE_HIP1009, receiveMessage);
return updateSuccess(msgId, sender, receiver); return updateSuccess(msgId, sender, receiver);
} }
reportService.report(reportDto); reportService.report(reportDto);
@ -81,7 +81,6 @@ public class HIP1009InspectionReportUpdatesHandler implements WebserviceReceiveS
} }
public ReportDto fetchBase64Parse(XmlUtil inspectionInsertXmlUtil) { public ReportDto fetchBase64Parse(XmlUtil inspectionInsertXmlUtil) {
Node senderNode = inspectionInsertXmlUtil.getNode("/POOR_HIP1009/sender/device/id/item/@extension"); Node senderNode = inspectionInsertXmlUtil.getNode("/POOR_HIP1009/sender/device/id/item/@extension");
String updateBy = senderNode.getNodeValue(); String updateBy = senderNode.getNodeValue();
@ -115,8 +114,9 @@ public class HIP1009InspectionReportUpdatesHandler implements WebserviceReceiveS
ReportDto reportDto = new ReportDto(); ReportDto reportDto = new ReportDto();
reportDto.setAdmisstimes(admissTimes); reportDto.setAdmisstimes(admissTimes);
reportDto.setInpatientNo(inpatientNo); reportDto.setInpatientNo(inpatientNo);
// 确定报告唯一 报告单号+申请单号 // 确定报告唯一 报告单号+申请单号,如果报告单号带下划线是合并报告,取报告单号下划线前的
reportDto.setSerialnum(examReportSn + requestSn); String serialnum = examReportSn + requestSn;
reportDto.setFileTitle(reportName); reportDto.setFileTitle(reportName);
reportDto.setVisitSn(visitSn); reportDto.setVisitSn(visitSn);
reportDto.setPatientSn(patientSn); reportDto.setPatientSn(patientSn);
@ -129,6 +129,10 @@ public class HIP1009InspectionReportUpdatesHandler implements WebserviceReceiveS
if (Func.isBlank(base64)) { if (Func.isBlank(base64)) {
return null; return null;
} }
if (examReportSn.contains("_")) {
serialnum = split[0];
}
reportDto.setSerialnum(serialnum);
String url = reportJob.saveBase64(base64); String url = reportJob.saveBase64(base64);
reportDto.setDownUrl(url); reportDto.setDownUrl(url);
reportDto.setDowntype(5); reportDto.setDowntype(5);
@ -161,6 +165,11 @@ public class HIP1009InspectionReportUpdatesHandler implements WebserviceReceiveS
Node eafNoNode = inspectionUpdateXmlUtil.getNode("/POOR_HIP1009/controlActProcess/subject/recordTarget/patientRole/id[@root='2.16.156.10011.1.24']/@extension"); Node eafNoNode = inspectionUpdateXmlUtil.getNode("/POOR_HIP1009/controlActProcess/subject/recordTarget/patientRole/id[@root='2.16.156.10011.1.24']/@extension");
String eafNo = eafNoNode.getNodeValue(); String eafNo = eafNoNode.getNodeValue();
String serialnum = reportFlag + "@" + eafNo; String serialnum = reportFlag + "@" + eafNo;
// 如果报告单号带下划线是合并报告,取报告单号下划线前的
if (reportFlag.contains("_")) {
String[] split = reportFlag.split("_");
serialnum = split[0];
}
// Node assortIdNode = inspectionUpdateXmlUtil.getNode("/POOR_HIP1009/controlActProcess/subject/component/structuredBody/component[@displayName='检查报告']/section/entry[@displayName='检查类型']/observation/code/@displayName"); // Node assortIdNode = inspectionUpdateXmlUtil.getNode("/POOR_HIP1009/controlActProcess/subject/component/structuredBody/component[@displayName='检查报告']/section/entry[@displayName='检查类型']/observation/code/@displayName");
// String assortId = assortIdNode.getNodeValue(); // String assortId = assortIdNode.getNodeValue();

Loading…
Cancel
Save