From 986be2f12021ef0f03e39d3f2492e7fae6997503 Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Thu, 29 Jun 2023 17:45:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8A=A5=E5=91=8A=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E5=88=9D=E5=A7=8B=E4=B8=BA=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-config/js-report-config.xml | 25 - data-config/js-table-type.json | 5 - .../js-webservice-template-request.xml | 25 - .../js-webservice-template-response.xml | 11 - pom.xml | 2 +- script/服务迭代sql.sql | 24 - src/main/java/com/docus/server/CxfConfig.java | 29 +- .../server/message/config/UrlConfig.java | 30 + .../message/consts/InteractiveMethod.java | 17 + .../controller/MessageReceiveController.java | 35 + .../com/docus/server/message/dto/Message.java | 14 + .../message/service/UnifyMessageService.java | 14 + .../impl/HttpUnifyMessageServiceImpl.java | 16 + .../WebServiceUnifyMessageServiceImpl.java | 16 + .../{report => message}/util/IdUtil.java | 2 +- .../util/TableJsonRead.java | 2 +- .../{report => message}/util/XmlUtil.java | 2 +- .../config/ApplicationBusinessConfig.java | 18 - .../controller/ReportDownController.java | 44 - .../server/report/dto/ReportDownDto.java | 30 - .../report/dto/ReportDownPatientDto.java | 27 - .../report/dto/ReportDownScanFileDto.java | 41 - .../docus/server/report/dto/ReportDto.java | 68 -- .../server/report/entity/AfCollectTask.java | 79 -- .../server/report/entity/AfReportRecord.java | 103 -- .../docus/server/report/entity/TBasic.java | 158 --- .../server/report/event/ReportDownEvent.java | 28 - .../report/listener/ReportDownListener.java | 83 -- .../report/mapper/AfCollectTaskMapper.java | 27 - .../report/mapper/AfReportRecordMapper.java | 52 - .../server/report/mapper/TBasicMapper.java | 25 - .../server/report/service/ReportService.java | 24 - .../service/impl/ReportServiceImpl.java | 119 -- .../docus/server/report/util/JSXMLResult.java | 41 - .../report/webservice/IReportServer.java | 39 - .../webservice/impl/SdryReportServerImpl.java | 529 -------- src/main/resources/bootstrap.yml | 13 +- .../resources/mapper/AfCollectTaskMapper.xml | 17 - .../resources/mapper/AfReportRecordMapper.xml | 56 - src/main/resources/mapper/TBasicMapper.xml | 13 - .../impl/SdryReportServerImplTest.java | 1083 ----------------- 41 files changed, 173 insertions(+), 2813 deletions(-) delete mode 100644 data-config/js-report-config.xml delete mode 100644 data-config/js-table-type.json delete mode 100644 data-config/js-webservice-template-request.xml delete mode 100644 data-config/js-webservice-template-response.xml delete mode 100644 script/服务迭代sql.sql create mode 100644 src/main/java/com/docus/server/message/config/UrlConfig.java create mode 100644 src/main/java/com/docus/server/message/consts/InteractiveMethod.java create mode 100644 src/main/java/com/docus/server/message/controller/MessageReceiveController.java create mode 100644 src/main/java/com/docus/server/message/dto/Message.java create mode 100644 src/main/java/com/docus/server/message/service/UnifyMessageService.java create mode 100644 src/main/java/com/docus/server/message/service/impl/HttpUnifyMessageServiceImpl.java create mode 100644 src/main/java/com/docus/server/message/service/impl/WebServiceUnifyMessageServiceImpl.java rename src/main/java/com/docus/server/{report => message}/util/IdUtil.java (91%) rename src/main/java/com/docus/server/{report => message}/util/TableJsonRead.java (99%) rename src/main/java/com/docus/server/{report => message}/util/XmlUtil.java (99%) delete mode 100644 src/main/java/com/docus/server/report/config/ApplicationBusinessConfig.java delete mode 100644 src/main/java/com/docus/server/report/controller/ReportDownController.java delete mode 100644 src/main/java/com/docus/server/report/dto/ReportDownDto.java delete mode 100644 src/main/java/com/docus/server/report/dto/ReportDownPatientDto.java delete mode 100644 src/main/java/com/docus/server/report/dto/ReportDownScanFileDto.java delete mode 100644 src/main/java/com/docus/server/report/dto/ReportDto.java delete mode 100644 src/main/java/com/docus/server/report/entity/AfCollectTask.java delete mode 100644 src/main/java/com/docus/server/report/entity/AfReportRecord.java delete mode 100644 src/main/java/com/docus/server/report/entity/TBasic.java delete mode 100644 src/main/java/com/docus/server/report/event/ReportDownEvent.java delete mode 100644 src/main/java/com/docus/server/report/listener/ReportDownListener.java delete mode 100644 src/main/java/com/docus/server/report/mapper/AfCollectTaskMapper.java delete mode 100644 src/main/java/com/docus/server/report/mapper/AfReportRecordMapper.java delete mode 100644 src/main/java/com/docus/server/report/mapper/TBasicMapper.java delete mode 100644 src/main/java/com/docus/server/report/service/ReportService.java delete mode 100644 src/main/java/com/docus/server/report/service/impl/ReportServiceImpl.java delete mode 100644 src/main/java/com/docus/server/report/util/JSXMLResult.java delete mode 100644 src/main/java/com/docus/server/report/webservice/IReportServer.java delete mode 100644 src/main/java/com/docus/server/report/webservice/impl/SdryReportServerImpl.java delete mode 100644 src/main/resources/mapper/AfCollectTaskMapper.xml delete mode 100644 src/main/resources/mapper/AfReportRecordMapper.xml delete mode 100644 src/main/resources/mapper/TBasicMapper.xml delete mode 100644 src/test/java/com/docus/server/report/webservice/impl/SdryReportServerImplTest.java diff --git a/data-config/js-report-config.xml b/data-config/js-report-config.xml deleted file mode 100644 index d74c2a3..0000000 --- a/data-config/js-report-config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - /Request/Msg/INHOSP_INDEX_NO - - /Request/Msg/INHOSP_NO - - /Request/Msg/INHOSP_NUM - - /Request/Msg/UNIQUE_FILE - - /Request/Msg/FILE_NAME - - /Request/Msg/PDF_PATH - - /Request/Msg/TABLE_TYPE - - - - /Request/Msg/TABLE_TYPE - - - - - \ No newline at end of file diff --git a/data-config/js-table-type.json b/data-config/js-table-type.json deleted file mode 100644 index 3a7fd45..0000000 --- a/data-config/js-table-type.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "icu": "重症文件分段id", - "sa": "手麻文件分段id", - "other": "其他文件分段id" -} \ No newline at end of file diff --git a/data-config/js-webservice-template-request.xml b/data-config/js-webservice-template-request.xml deleted file mode 100644 index 0d32ef2..0000000 --- a/data-config/js-webservice-template-request.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - 123456 - - 012345 - - 012345 - - 2 - - icu - - 20220303111800 - - 20220303111801 - - http://192.168.1.108:9012/file/0123_01.pdf - - 0123_01 - - AESHASHMD5DEFIND - - diff --git a/data-config/js-webservice-template-response.xml b/data-config/js-webservice-template-response.xml deleted file mode 100644 index 8ceb826..0000000 --- a/data-config/js-webservice-template-response.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - 0 - - 123456 - - 成功！ - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9a242e7..421bc8a 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - docus-webservice-report + docus-unified-message diff --git a/script/服务迭代sql.sql b/script/服务迭代sql.sql deleted file mode 100644 index ee533ee..0000000 --- a/script/服务迭代sql.sql +++ /dev/null @@ -1,24 +0,0 @@ -#-- 服务接收报告消息保存数据--# -USE `docus_archivefile`; -CREATE TABLE `af_report_record` ( - `task_id` bigint(19) NOT NULL COMMENT 'af_collect_task 主键id', - `inpatient_no` varchar(50) DEFAULT NULL COMMENT '住院号', - `jzh` varchar(50) DEFAULT NULL COMMENT '住院流水号，记账号', - `admiss_times` int(11) DEFAULT NULL COMMENT '住院次数', - `down_url` varchar(2048) DEFAULT NULL COMMENT '下载地址，多个使用| 分隔', - `down_type` int(11) DEFAULT NULL COMMENT '下载路径类型 1:url,2:base64,3:url base64,4:共享文件，5：本地文件base64', - `state` int(11) DEFAULT NULL COMMENT '状态 0 未开始，可用于补偿，1 已发送下载', - `serialnum` varchar(200) DEFAULT NULL COMMENT '文件唯一标识', - `sysflag` varchar(50) DEFAULT NULL COMMENT '文件来源 采集系统', - `zd_assort_id` varchar(200) DEFAULT NULL COMMENT '文件分段id', - `create_time` datetime DEFAULT NULL COMMENT '记录创建时间', - `update_time` datetime DEFAULT NULL COMMENT '记录更新时间', - `file_name` varchar(255) DEFAULT NULL COMMENT '文件名称', - `patient_id` varchar(50) DEFAULT NULL COMMENT '病案主键', - PRIMARY KEY (`task_id`), - KEY `idx_af_report_record_patientid` (`patient_id`) USING BTREE, - KEY `idx_af_report_record_inpatient_no` (`inpatient_no`) USING BTREE, - KEY `idx_af_report_record_jzh` (`jzh`) USING BTREE, - KEY `idx_af_report_record_state` (`state`) USING BTREE, - KEY `idx_af_report_record_sysflag` (`sysflag`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='文件上报接收记录'; \ No newline at end of file diff --git a/src/main/java/com/docus/server/CxfConfig.java b/src/main/java/com/docus/server/CxfConfig.java index 8cdabde..3314312 100644 --- a/src/main/java/com/docus/server/CxfConfig.java +++ b/src/main/java/com/docus/server/CxfConfig.java @@ -1,22 +1,29 @@ package com.docus.server; -import com.docus.server.report.webservice.IReportServer; +import com.docus.server.message.consts.InteractiveMethod; +import com.docus.server.message.service.UnifyMessageService; +import org.apache.cxf.Bus; +import org.apache.cxf.bus.spring.SpringBus; import org.apache.cxf.jaxws.EndpointImpl; -import lombok.RequiredArgsConstructor; +import org.apache.cxf.transport.servlet.CXFServlet; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.apache.cxf.Bus; -import org.apache.cxf.bus.spring.SpringBus; -import org.apache.cxf.transport.servlet.CXFServlet; import javax.xml.ws.Endpoint; @Configuration -@RequiredArgsConstructor public class CxfConfig { - private final IReportServer reportServer; + + private UnifyMessageService unifyMessageService; + + @Autowired + @Qualifier(InteractiveMethod.WS) + public void setUnifyMessageService(UnifyMessageService unifyMessageService) { + this.unifyMessageService = unifyMessageService; + } /** * 注入Servlet，注意beanName不能为dispatcherServlet @@ -34,10 +41,10 @@ public class CxfConfig { } @Bean - @Qualifier("reportEndPoint") - public Endpoint userEndPoint() { - EndpointImpl endpoint = new EndpointImpl(springBus(), reportServer); - endpoint.publish("/api/report"); + @Qualifier("unifyEndPoint") + public Endpoint unifyEndPoint() { + EndpointImpl endpoint = new EndpointImpl(springBus(), null); + endpoint.publish("/api/unify"); return endpoint; } } diff --git a/src/main/java/com/docus/server/message/config/UrlConfig.java b/src/main/java/com/docus/server/message/config/UrlConfig.java new file mode 100644 index 0000000..761844c --- /dev/null +++ b/src/main/java/com/docus/server/message/config/UrlConfig.java @@ -0,0 +1,30 @@ +package com.docus.server.message.config; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * 应用业务配置 + * @author wyb + */ +@Component +@Getter +@Setter +@ConfigurationProperties(prefix = "docus.url") +public class UrlConfig { + /** + * 下载接口地址的配置 + */ + private String downUrl; + /** + * 任务补偿接口地址的配置 + */ + private String compensateTaskUrl; + /** + * 获取基础信息数据的接口 + */ + private String getBasicDataUrl; + +} diff --git a/src/main/java/com/docus/server/message/consts/InteractiveMethod.java b/src/main/java/com/docus/server/message/consts/InteractiveMethod.java new file mode 100644 index 0000000..f2ab7d5 --- /dev/null +++ b/src/main/java/com/docus/server/message/consts/InteractiveMethod.java @@ -0,0 +1,17 @@ +package com.docus.server.message.consts; + +/** + * 接受消息的交互方式 + * @author wyb + */ +public interface InteractiveMethod { + /** + * Http接收消息统一服务处理方式 + */ + String HTTP = "HttpUnifyMessageService"; + /** + * WebService接收消息统一服务处理方式" + */ + String WS = "WebServiceUnifyMessageService"; + +} diff --git a/src/main/java/com/docus/server/message/controller/MessageReceiveController.java b/src/main/java/com/docus/server/message/controller/MessageReceiveController.java new file mode 100644 index 0000000..25d4013 --- /dev/null +++ b/src/main/java/com/docus/server/message/controller/MessageReceiveController.java @@ -0,0 +1,35 @@ +package com.docus.server.message.controller; + +import com.docus.server.message.consts.InteractiveMethod; +import com.docus.server.message.dto.Message; +import com.docus.server.message.service.UnifyMessageService; +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 消息接收控制 + * @author wyb + */ +@Api("") +@RestController +@Slf4j +@RequestMapping("/api/message") +public class MessageReceiveController { + private UnifyMessageService unifyMessageService; + + @Autowired + @Qualifier(InteractiveMethod.HTTP) + public void setUnifyMessageService(UnifyMessageService unifyMessageService) { + this.unifyMessageService = unifyMessageService; + } + + @PostMapping("/receive") + public String receiveMessage(Message message){ + return unifyMessageService.receive(message.getMethod(),message.getMessage()); + } +} diff --git a/src/main/java/com/docus/server/message/dto/Message.java b/src/main/java/com/docus/server/message/dto/Message.java new file mode 100644 index 0000000..f49e1bf --- /dev/null +++ b/src/main/java/com/docus/server/message/dto/Message.java @@ -0,0 +1,14 @@ +package com.docus.server.message.dto; + +import lombok.Getter; +import lombok.Setter; + +/** + * @author wyb + */ +@Getter +@Setter +public class Message { + private String method; + private String message; +} diff --git a/src/main/java/com/docus/server/message/service/UnifyMessageService.java b/src/main/java/com/docus/server/message/service/UnifyMessageService.java new file mode 100644 index 0000000..8ef3d6f --- /dev/null +++ b/src/main/java/com/docus/server/message/service/UnifyMessageService.java @@ -0,0 +1,14 @@ +package com.docus.server.message.service; + +import javax.jws.WebService; + +@WebService +public interface UnifyMessageService { + /** + * 消息统一接收 + * @param method 方法 + * @param message 消息 + * @return 处理结果 + */ + String receive(String method,String message); +} diff --git a/src/main/java/com/docus/server/message/service/impl/HttpUnifyMessageServiceImpl.java b/src/main/java/com/docus/server/message/service/impl/HttpUnifyMessageServiceImpl.java new file mode 100644 index 0000000..a3d4d88 --- /dev/null +++ b/src/main/java/com/docus/server/message/service/impl/HttpUnifyMessageServiceImpl.java @@ -0,0 +1,16 @@ +package com.docus.server.message.service.impl; + +import com.docus.server.message.consts.InteractiveMethod; +import com.docus.server.message.service.UnifyMessageService; +import org.springframework.stereotype.Service; + +/** + * @author wyb + */ +@Service(InteractiveMethod.HTTP) +public class HttpUnifyMessageServiceImpl implements UnifyMessageService { + @Override + public String receive(String method,String message) { + return null; + } +} diff --git a/src/main/java/com/docus/server/message/service/impl/WebServiceUnifyMessageServiceImpl.java b/src/main/java/com/docus/server/message/service/impl/WebServiceUnifyMessageServiceImpl.java new file mode 100644 index 0000000..e1e48ff --- /dev/null +++ b/src/main/java/com/docus/server/message/service/impl/WebServiceUnifyMessageServiceImpl.java @@ -0,0 +1,16 @@ +package com.docus.server.message.service.impl; + +import com.docus.server.message.consts.InteractiveMethod; +import com.docus.server.message.service.UnifyMessageService; +import org.springframework.stereotype.Service; + +/** + * @author WYBDEV + */ +@Service(InteractiveMethod.WS) +public class WebServiceUnifyMessageServiceImpl implements UnifyMessageService { + @Override + public String receive(String method,String message) { + return null; + } +} diff --git a/src/main/java/com/docus/server/report/util/IdUtil.java b/src/main/java/com/docus/server/message/util/IdUtil.java similarity index 91% rename from src/main/java/com/docus/server/report/util/IdUtil.java rename to src/main/java/com/docus/server/message/util/IdUtil.java index 57781ca..0e6324d 100644 --- a/src/main/java/com/docus/server/report/util/IdUtil.java +++ b/src/main/java/com/docus/server/message/util/IdUtil.java @@ -1,4 +1,4 @@ -package com.docus.server.report.util; +package com.docus.server.message.util; import lombok.Data; diff --git a/src/main/java/com/docus/server/report/util/TableJsonRead.java b/src/main/java/com/docus/server/message/util/TableJsonRead.java similarity index 99% rename from src/main/java/com/docus/server/report/util/TableJsonRead.java rename to src/main/java/com/docus/server/message/util/TableJsonRead.java index 83270f6..e892d97 100644 --- a/src/main/java/com/docus/server/report/util/TableJsonRead.java +++ b/src/main/java/com/docus/server/message/util/TableJsonRead.java @@ -1,4 +1,4 @@ -package com.docus.server.report.util; +package com.docus.server.message.util; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.util.StringUtils; diff --git a/src/main/java/com/docus/server/report/util/XmlUtil.java b/src/main/java/com/docus/server/message/util/XmlUtil.java similarity index 99% rename from src/main/java/com/docus/server/report/util/XmlUtil.java rename to src/main/java/com/docus/server/message/util/XmlUtil.java index 79d8e6b..24765c7 100644 --- a/src/main/java/com/docus/server/report/util/XmlUtil.java +++ b/src/main/java/com/docus/server/message/util/XmlUtil.java @@ -14,7 +14,7 @@ * this software without specific prior written permission. * Author: DreamLu 卢春梦 (596392912@qq.com) */ -package com.docus.server.report.util; +package com.docus.server.message.util; import com.docus.core.util.Exceptions; import com.docus.core.util.IoUtil; diff --git a/src/main/java/com/docus/server/report/config/ApplicationBusinessConfig.java b/src/main/java/com/docus/server/report/config/ApplicationBusinessConfig.java deleted file mode 100644 index c4d05fd..0000000 --- a/src/main/java/com/docus/server/report/config/ApplicationBusinessConfig.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.docus.server.report.config; - -import lombok.Getter; -import lombok.Setter; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -/** - * 应用业务配置 - * @author wyb - */ -@Component -@Getter -@Setter -public class ApplicationBusinessConfig { - @Value("${docus.report.downurl:}") - private String downUrl; -} diff --git a/src/main/java/com/docus/server/report/controller/ReportDownController.java b/src/main/java/com/docus/server/report/controller/ReportDownController.java deleted file mode 100644 index 8c08e37..0000000 --- a/src/main/java/com/docus/server/report/controller/ReportDownController.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.docus.server.report.controller; - -import com.docus.core.util.Func; -import com.docus.infrastructure.web.api.CommonResult; -import com.docus.server.report.service.ReportService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @author wyb - * 文件上报下载服务 - */ -@Slf4j -@Api(tags = "文件上报，补偿控制") -@RestController -@RequestMapping("/report/makeup") -public class ReportDownController { - @Resource - private ReportService reportService; - - @ApiOperation(value = "根据任务id补偿报告下载") - @PostMapping("/makeupReportByTaskIds") - public CommonResult makeupReportByTaskIds(@RequestBody List taskIds){ - if (Func.isEmpty(taskIds)) { - return CommonResult.failed("补偿任务id不能为空！"); - } - try { - reportService.makeupReportByTaskIds(taskIds); - } catch (Exception ex) { - log.error(ex.getMessage(), ex); - return CommonResult.failed("补偿出现了一点小问题！"); - } - return CommonResult.success("补偿成功！"); - } - -} diff --git a/src/main/java/com/docus/server/report/dto/ReportDownDto.java b/src/main/java/com/docus/server/report/dto/ReportDownDto.java deleted file mode 100644 index d61edaa..0000000 --- a/src/main/java/com/docus/server/report/dto/ReportDownDto.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.docus.server.report.dto; - - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -@Data -public class ReportDownDto { - @ApiModelProperty(value = "采集器id") - private String collectorid; - - @ApiModelProperty(value = "采集器ip") - private String ip; - - @ApiModelProperty(value = "分类id") - private String assortid; - - @ApiModelProperty(value = "患者信息") - private ReportDownPatientDto patient; - - @ApiModelProperty(value = "文件信息") - private List scanfiles; - - @ApiModelProperty(value = "扫描用户代码") - private String scanusercode; - @ApiModelProperty(value = "扫描用户名称") - private String scanusername; -} \ No newline at end of file diff --git a/src/main/java/com/docus/server/report/dto/ReportDownPatientDto.java b/src/main/java/com/docus/server/report/dto/ReportDownPatientDto.java deleted file mode 100644 index 083bd37..0000000 --- a/src/main/java/com/docus/server/report/dto/ReportDownPatientDto.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.docus.server.report.dto; - -import com.docus.server.report.entity.AfReportRecord; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class ReportDownPatientDto { - @ApiModelProperty(value = "记帐号") - private String jzh; - @ApiModelProperty(value = "住院次数,记帐号重复则加这个参数，无则Null") - private Integer admisstimes; - @ApiModelProperty(value = "病案主键，如有传则使用，无则使用jzh") - private String patientid; - @ApiModelProperty(value = "病案号") - private String inpatientno; - - @ApiModelProperty(value = "物理存储位置，有则传") - private String storagelocation; - - public ReportDownPatientDto(AfReportRecord reportRecord) { - this.patientid = reportRecord.getPatientId(); - this.jzh = reportRecord.getJzh(); - this.admisstimes = reportRecord.getAdmissTimes(); - this.inpatientno = reportRecord.getInpatientNo(); - } -} diff --git a/src/main/java/com/docus/server/report/dto/ReportDownScanFileDto.java b/src/main/java/com/docus/server/report/dto/ReportDownScanFileDto.java deleted file mode 100644 index 1c711c7..0000000 --- a/src/main/java/com/docus/server/report/dto/ReportDownScanFileDto.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.docus.server.report.dto; - -import com.docus.server.report.entity.AfReportRecord; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class ReportDownScanFileDto { - @ApiModelProperty(value = "任务id(如无效任务id，则不更新任务表数据)") - private Long taskid; - @ApiModelProperty(value = "文件标题") - private String filetitle; - @ApiModelProperty(value = "采集类型(文件来源 1:采集器；2：扫描生产软件)") - private int filesource; - @ApiModelProperty(value = "下载类型(1:服务器本地；2：ftp服务器；3：共享文件夹)") - private int filestoragetype; - @ApiModelProperty(value = "文件类型(1:url,2:base64,3:url base64,4:共享文件，5：本地文件base64)") - private int filetype=1; - @ApiModelProperty(value = "下载地址") - private String downurl; - // @ApiModelProperty(value = "档案信息") -// private String recordid; - @ApiModelProperty(value = "采集流水号") - private String serialnum; - - @ApiModelProperty(value = "排序日期") - private String sortdate; - - @ApiModelProperty(value = "是否作废 ： 0：否 不作废，1：是 作废") - private int cancel=0; - - public ReportDownScanFileDto(AfReportRecord reportRecord) { - this.taskid=reportRecord.getTaskId(); - this.filetitle=reportRecord.getFileName(); - this.filesource= 1; - this.filestoragetype=1; - this.filetype=reportRecord.getDownType(); - this.downurl=reportRecord.getDownUrl(); - this.serialnum=reportRecord.getSerialnum(); - } -} diff --git a/src/main/java/com/docus/server/report/dto/ReportDto.java b/src/main/java/com/docus/server/report/dto/ReportDto.java deleted file mode 100644 index 2b74c3e..0000000 --- a/src/main/java/com/docus/server/report/dto/ReportDto.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.docus.server.report.dto; - -import lombok.Data; - -/** - * 报告推送信息 - */ -@Data -public class ReportDto { - /** - * 住院号 - */ - private String inpatientNo; - /** - * 记账号/住院流水号 - */ - private String jzh; - /** - * 住院次数 - */ - private Integer admisstimes; - /** - * 采集来源系统 - */ - private String sysFlag; - /** - * 下载地址 - */ - private String downUrl; - /** - * 文件名 - */ - private String fileTitle; - /** - * 采集流水号/文件唯一id - */ - private String serialnum; - - /** - * 文件分类id - */ - private String assortId; - - /** - * 采集类型(文件来源 1:采集器；2：扫描生产软件) - */ - private String fileSource; - - /** - * 文件保存位置类型 1:服务器本地；2：ftp服务器；3：共享文件夹 - */ - private String filestoragetype; - - /** - * 下载对应任务id ,接收处理 - */ - private Long taskId; - - /** - * 业务病案主键 - */ - private String patientId; - - /** - * 下载路径类型 1:url，2:base64，3:url base64，4:共享文件，5：本地文件base64 - */ - private Integer downtype=1; -} diff --git a/src/main/java/com/docus/server/report/entity/AfCollectTask.java b/src/main/java/com/docus/server/report/entity/AfCollectTask.java deleted file mode 100644 index f9cc8a8..0000000 --- a/src/main/java/com/docus/server/report/entity/AfCollectTask.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.docus.server.report.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - *

- * 病案采集任务 - *

- * - * @author 曾文和 - * @since 2021-05-07 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "AfCollectTask对象", description = "病案采集任务") -public class AfCollectTask implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "id 主键") - @TableId(value = "id", type = IdType.INPUT) - private Long id; - - @ApiModelProperty(value = "病案主键") - private String patientId; - - @ApiModelProperty(value = "来源 1护理文书，2 电子病历，3 Pacs检查，4心电图，5手麻系统，6 Lis检验，7病案首页，8长临医嘱") - private String sysflag; - - @ApiModelProperty(value = "开始时间") - private Date startTime; - - @ApiModelProperty(value = "结束时间") - private Date endTime; - - @ApiModelProperty(value = "任务耗时(毫秒)") - private Long consumingTime; - - @ApiModelProperty(value = "-1 等待采集，0：未开始，1:正在采集，2：采集错误，3采集完成") - private String state; - - @ApiModelProperty(value = "同步时间") - private Date syncTime; - - @ApiModelProperty(value = "最新重新采集时间") - private Date recollectTime; - - @ApiModelProperty(value = "最新重新采集人") - private String recollectName; - - @ApiModelProperty(value = "备注") - private String remark; - - @ApiModelProperty(value = "报告唯一单号") - private String C1; - - @ApiModelProperty(value = "c2") - private String C2; - - @ApiModelProperty(value = "记账号") - private String C3; - - @ApiModelProperty(value = "c4") - private String C4; - - @ApiModelProperty(value = "c6") - private String C6; - - @ApiModelProperty(value = "c9") - private String C9; -} diff --git a/src/main/java/com/docus/server/report/entity/AfReportRecord.java b/src/main/java/com/docus/server/report/entity/AfReportRecord.java deleted file mode 100644 index 676fac1..0000000 --- a/src/main/java/com/docus/server/report/entity/AfReportRecord.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.docus.server.report.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.docus.server.report.dto.ReportDto; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 上报记录保存表 - */ -@Data -public class AfReportRecord implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * af_collect_task 主键id - */ - private Long taskId; - - /** - * 住院号 - */ - private String inpatientNo; - - /** - * 住院流水号，记账号 - */ - private String jzh; - - /** - * 住院次数 - */ - private Integer admissTimes; - - /** - * 下载地址，多个使用 | 分隔 - */ - private String downUrl; - - /** - * 下载路径类型 1:url，2:base64，3:url base64，4:共享文件，5：本地文件base64 - */ - private Integer downType; - - /** - * 状态 0 未开始，可用于补偿，1 已发送下载 - */ - private Integer state; - - /** - * 报告唯一id - */ - private String serialnum; - - /** - * 报告来源 采集器标识 - */ - private String sysflag; - - /** - * 报告所属文件分段id - */ - private String zdAssortId; - - /** - * 记录创建时间 - */ - private Date createTime; - - /** - * 记录更新时间 - */ - private Date updateTime; - - /** - * 报告名称 - */ - private String fileName; - - /** - * 病案主键 - */ - private String patientId; - - - public AfReportRecord() { - } - public AfReportRecord(ReportDto reportDto){ - this.jzh=reportDto.getJzh(); - this.admissTimes=reportDto.getAdmisstimes(); - this.inpatientNo=reportDto.getInpatientNo(); - this.downUrl=reportDto.getDownUrl(); - this.sysflag=reportDto.getSysFlag(); - this.zdAssortId=reportDto.getAssortId(); - this.serialnum=reportDto.getSerialnum(); - this.fileName=reportDto.getFileTitle(); - this.downType=reportDto.getDowntype(); - } -} \ No newline at end of file diff --git a/src/main/java/com/docus/server/report/entity/TBasic.java b/src/main/java/com/docus/server/report/entity/TBasic.java deleted file mode 100644 index 42e40e4..0000000 --- a/src/main/java/com/docus/server/report/entity/TBasic.java +++ /dev/null @@ -1,158 +0,0 @@ -package com.docus.server.report.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - *

- * 病案基本信息 - *

- * - * @author jiashi - * @since 2021-04-14 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "TBasic对象", description = "病案基本信息") -public class TBasic implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "病案主键") - @TableId(value = "patient_id", type = IdType.ASSIGN_ID) - private String patientId; - - @ApiModelProperty(value = "住院次数") - private Integer admissTimes; - - @ApiModelProperty(value = "病案号") - private String inpatientNo; - - @ApiModelProperty(value = "住院ID号") - private String admissId; - - @ApiModelProperty(value = "患者姓名") - private String name; - - @ApiModelProperty(value = "盘号") - private String ph; - - @ApiModelProperty(value = "性别") - private String sex; - - @ApiModelProperty(value = "年龄_岁") - private Integer age; - - @ApiModelProperty(value = "年龄_月") - private Integer ageMonth; - - @ApiModelProperty(value = "年龄_天") - private Integer ageDay; - - @ApiModelProperty(value = "身份证") - private String idCard; - - @ApiModelProperty(value = "手机号码") - private String telphone; - - @ApiModelProperty(value = "住院日期") - private Date admissDate; - - @ApiModelProperty(value = "住院科室") - private String admissDept; - - @ApiModelProperty(value = "住院科室名称") - private String admissDeptName; - - @ApiModelProperty(value = "出院日期") - private Date disDate; - - @ApiModelProperty(value = "出院科室") - private String disDept; - - @ApiModelProperty(value = "出院科室名称") - private String disDeptName; - - @ApiModelProperty(value = "实际住院天数") - private Integer admissDays; - - @ApiModelProperty(value = "主管医生") - private String attending; - - @ApiModelProperty(value = "主管医生名称") - private String attendingName; - - @ApiModelProperty(value = "主要诊断编码") - private String mainDiagCode; - - @ApiModelProperty(value = "主要诊断名称") - private String mainDiagName; - - @ApiModelProperty(value = "主要手术编码") - private String mainOperateCode; - - @ApiModelProperty(value = "主要手术名称") - private String mainOperateName; - - @ApiModelProperty(value = "是否死亡") - private Integer isDead; - - @ApiModelProperty(value = "是否作废(0：否，1：是)") - private Integer isCancel; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "是否归档 1：已归档，0：未归档") - private Integer isArchive; - - @ApiModelProperty(value = "归档时间") - private Date archiveTime; - - @ApiModelProperty(value = "文件来源 1:af_archive_detail,2:t_scan_assort") - private Integer fileSource; - - @ApiModelProperty(value = "完整性描述") - private String integrityDesc; - - private String bColumn1; - - private String bColumn2; - - private String bColumn3; - - private String bColumn4; - - private String bColumn5; - - private Integer bColumn6; - - private Integer bColumn7; - - private Integer bColumn8; - - private Integer bColumn9; - - private Integer bColumn10; - - @ApiModelProperty(value = "姓名缩写（内部构成）") - private String nameSpell; - - @ApiModelProperty(value = "性别名称") - private String sexName; - - @ApiModelProperty(value = "记账号") - private String jzh; - - -} diff --git a/src/main/java/com/docus/server/report/event/ReportDownEvent.java b/src/main/java/com/docus/server/report/event/ReportDownEvent.java deleted file mode 100644 index 4f52abf..0000000 --- a/src/main/java/com/docus/server/report/event/ReportDownEvent.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.docus.server.report.event; - -import lombok.Getter; -import org.springframework.context.ApplicationEvent; - -/** - * 下载触发 - * @author wyb - */ -@Getter -public class ReportDownEvent extends ApplicationEvent { - /** - * 下载对应任务id ,接收处理 - */ - private final Long taskId; - - /** - * - * @param source 触发该事件的对象 - * @param taskId 该事件携带的信息 - */ - public ReportDownEvent(Object source,Long taskId) { - super(source); - this.taskId=taskId; - } - - -} diff --git a/src/main/java/com/docus/server/report/listener/ReportDownListener.java b/src/main/java/com/docus/server/report/listener/ReportDownListener.java deleted file mode 100644 index a67f427..0000000 --- a/src/main/java/com/docus/server/report/listener/ReportDownListener.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.docus.server.report.listener; - -import cn.hutool.http.HttpRequest; -import cn.hutool.http.HttpResponse; -import cn.hutool.http.HttpUtil; -import com.docus.core.util.Func; -import com.docus.infrastructure.web.api.CommonResult; -import com.docus.infrastructure.web.api.ResultCode; -import com.docus.server.report.config.ApplicationBusinessConfig; -import com.docus.server.report.dto.ReportDownDto; -import com.docus.server.report.dto.ReportDownPatientDto; -import com.docus.server.report.dto.ReportDownScanFileDto; -import com.docus.server.report.entity.AfReportRecord; -import com.docus.server.report.event.ReportDownEvent; -import com.docus.server.report.mapper.AfReportRecordMapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.event.EventListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -/** - * 上报下载监听 - * - * @author wyb - */ -@Component -@Slf4j -public class ReportDownListener { - @Resource - private ApplicationBusinessConfig applicationBusinessConfig; - - @Resource - private AfReportRecordMapper afReportRecordMapper; - - @EventListener - @Async("threadPoolExecutor") - public void reportDown(ReportDownEvent reportDownEvent) { - // 根据任务id获取上报记录信息 - AfReportRecord afReportRecord = afReportRecordMapper.getReportRecordInfoByTaskId(reportDownEvent.getTaskId()); - - // 组织基础信息数据 - ReportDownPatientDto reportDownPatientDto = new ReportDownPatientDto(afReportRecord); - - // 组织文件数据 - List reportDownScanFileDtos = new ArrayList<>(5); - ReportDownScanFileDto reportDownScanFileDto = new ReportDownScanFileDto(afReportRecord); - reportDownScanFileDtos.add(reportDownScanFileDto); - - // 组织下载数据，基础信息和文件数据 - ReportDownDto reportDownDto = new ReportDownDto(); - reportDownDto.setAssortid(afReportRecord.getZdAssortId()); - reportDownDto.setCollectorid(afReportRecord.getSysflag()); - reportDownDto.setScanusercode("admin"); - reportDownDto.setScanusername("admin"); - reportDownDto.setPatient(reportDownPatientDto); - reportDownDto.setScanfiles(reportDownScanFileDtos); - - // 下面是调用下载服务 - - String requestParam = Func.toJson(reportDownDto); - try { - log.info("调用下载服务，地址：{} ，参数：{}",applicationBusinessConfig.getDownUrl(),requestParam); - HttpRequest post = HttpUtil.createPost(applicationBusinessConfig.getDownUrl()); - post.timeout(5 * 1000); - post.header("Content-Type", "application/json; charset=utf-8"); - post.body(requestParam); - HttpResponse response = post.execute(); - String respBody = response.body(); - log.info("调用下载服务成功,响应参数：{}", respBody); - CommonResult commonResult = Func.readJson(respBody, CommonResult.class); - if (ResultCode.SUCCESS.getCode().equals(commonResult.getCode())) { - // 下载返回了成功更新状态 - afReportRecordMapper.updateStateByTaskId(reportDownEvent.getTaskId()); - } - } catch (Exception e) { - log.error("调用下载服务失败", e); - } - } -} diff --git a/src/main/java/com/docus/server/report/mapper/AfCollectTaskMapper.java b/src/main/java/com/docus/server/report/mapper/AfCollectTaskMapper.java deleted file mode 100644 index f1545e6..0000000 --- a/src/main/java/com/docus/server/report/mapper/AfCollectTaskMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.docus.server.report.mapper; - -import com.docus.server.report.entity.AfCollectTask; -import org.apache.ibatis.annotations.Param; - -/** - * 任务采集表mapper - * @author wyb - * - */ -public interface AfCollectTaskMapper { - - - /** - * 保存任务 - * @param afCollectTask 采集任务 - * @return 数据库操作结果 - */ - int saveTask(@Param("task") AfCollectTask afCollectTask); - - /** - * 根据任务主键查询任务 - * @param taskId 任务主键 - * @return 任务信息 - */ - AfCollectTask getTaskById(@Param("id") Long taskId); -} diff --git a/src/main/java/com/docus/server/report/mapper/AfReportRecordMapper.java b/src/main/java/com/docus/server/report/mapper/AfReportRecordMapper.java deleted file mode 100644 index 5529275..0000000 --- a/src/main/java/com/docus/server/report/mapper/AfReportRecordMapper.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.docus.server.report.mapper; - -import com.docus.server.report.entity.AfReportRecord; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 上报记录保存表 - * @author wyb - */ -public interface AfReportRecordMapper { - /** - * 保存报告推送记录 - * @param afReportRecord 报告推送记录 - * @return 数据库操作结果 - */ - int saveRecord(@Param("reportRecord") AfReportRecord afReportRecord); - - /** - * 根据文件唯一号 住院号 住院次数 系统标识 得到唯一推送记录 - * @param serialnum 报告唯一号 - * @param inpatientNo 住院号 - * @param admisstimes 住院次数 - * @param sysFlag 系统标识 - * @return 报告推送记录 - */ - AfReportRecord getRecordBySerialnumAndInpatientNoAndSysFlag(@Param("serialnum") String serialnum, @Param("inpatientNo")String inpatientNo,@Param("admisstimes") Integer admisstimes, @Param("sysFlag")String sysFlag); - - /** - * 更新报告推送 主要更新 下载地址，下载类型，文件名称 - * @param afReportRecord 报告推送记录 - * @return 数据库操作结果 - */ - int updateRecordByTaskId(@Param("reportRecord")AfReportRecord afReportRecord); - - /** - * 更新记录的状态 - * @param taskId 任务id - * @return 数据库操作结果 - */ - int updateStateByTaskId(@Param("taskId") Long taskId); - - AfReportRecord getReportRecordInfoByTaskId(@Param("taskId") Long taskId); - - /** - * 根据任务id查询有patientId数据的任务id - * @param taskIds 任务id集合 - * @return 数据有patientId的任务id集合 - */ - List getHasPatientIdTaskIdsByTaskIds(@Param("taskIds") List taskIds); -} \ No newline at end of file diff --git a/src/main/java/com/docus/server/report/mapper/TBasicMapper.java b/src/main/java/com/docus/server/report/mapper/TBasicMapper.java deleted file mode 100644 index 6768589..0000000 --- a/src/main/java/com/docus/server/report/mapper/TBasicMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.docus.server.report.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.docus.server.report.entity.TBasic; -import org.apache.ibatis.annotations.Param; - -/** - *

- * 病案基本信息 Mapper 接口 - *

- * - * @author jiashi - * @since 2021-04-14 - */ -public interface TBasicMapper{ - - /** - * 根据住院号和住院次数查询业务系统中病案主键 - * @param inpatientNo 住院号 - * @param admissTimes 住院次数 - * @return 病案主键 - */ - String getPatientIdByInpatientNoAndAdminssTimes(@Param("inpatientNo") String inpatientNo,@Param("adminssTimes") Integer admissTimes); -} diff --git a/src/main/java/com/docus/server/report/service/ReportService.java b/src/main/java/com/docus/server/report/service/ReportService.java deleted file mode 100644 index e63ce61..0000000 --- a/src/main/java/com/docus/server/report/service/ReportService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.docus.server.report.service; - -import com.docus.server.report.dto.ReportDto; - -import java.util.List; - -/** - * 报告服务 - * @author wyb - */ -public interface ReportService { - - /** - * 上报文件 - * @param reportDto 上报文件参数 - */ - void report(ReportDto reportDto); - - /** - * 根据任务id集合补偿下载 - * @param taskIds 任务id集合 - */ - void makeupReportByTaskIds(List taskIds) throws Exception; -} diff --git a/src/main/java/com/docus/server/report/service/impl/ReportServiceImpl.java b/src/main/java/com/docus/server/report/service/impl/ReportServiceImpl.java deleted file mode 100644 index 355ab99..0000000 --- a/src/main/java/com/docus/server/report/service/impl/ReportServiceImpl.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.docus.server.report.service.impl; - -import com.docus.core.util.Func; -import com.docus.infrastructure.redis.service.IdService; -import com.docus.server.report.dto.ReportDto; -import com.docus.server.report.entity.AfCollectTask; -import com.docus.server.report.entity.AfReportRecord; -import com.docus.server.report.event.ReportDownEvent; -import com.docus.server.report.mapper.AfCollectTaskMapper; -import com.docus.server.report.mapper.AfReportRecordMapper; -import com.docus.server.report.mapper.TBasicMapper; -import com.docus.server.report.service.ReportService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; -import java.util.concurrent.TimeUnit; - -/** - * 报告服务实现类 - * - * @author wyb - */ -@Slf4j -@Service -public class ReportServiceImpl implements ReportService { - - @Resource - private ApplicationContext applicationContext; - @Resource - private AfCollectTaskMapper collectTaskMapper; - @Resource - private AfReportRecordMapper afReportRecordMapper; - @Resource - private TBasicMapper tBasicMapper; - @Resource - private IdService idService; - - @Override - public void report(ReportDto reportDto) { - String patientId = null; - try { - // 如果出现多条出错的情况，还是得保存收到的信息，人工干预处理 - patientId = tBasicMapper.getPatientIdByInpatientNoAndAdminssTimes(reportDto.getInpatientNo(), reportDto.getAdmisstimes()); - } catch (Exception ex) { - log.error("查询病案主键出错了", ex); - } - // 不验证数据，始终保存收到的信息 - AfReportRecord afReportRecord = afReportRecordMapper.getRecordBySerialnumAndInpatientNoAndSysFlag(reportDto.getSerialnum(), reportDto.getInpatientNo(), reportDto.getAdmisstimes(), reportDto.getSysFlag()); - if (afReportRecord == null) { - long id = idService.getDateSeq(); - afReportRecord = new AfReportRecord(reportDto); - afReportRecord.setTaskId(id); - afReportRecord.setPatientId(patientId); - afReportRecordMapper.saveRecord(afReportRecord); - } else { - // 更新 主要更新 url - afReportRecord.setDownUrl(reportDto.getDownUrl()); - afReportRecord.setDownType(reportDto.getDowntype()); - afReportRecord.setFileName(reportDto.getFileTitle()); - afReportRecord.setPatientId(patientId); - afReportRecordMapper.updateRecordByTaskId(afReportRecord); - } - // 不使用事务，不需要回滚上面的保存 - - // 根据记录中的任务id，查询是否需要新增任务 - if (Func.isBlank(patientId)) { - log.warn("病案号：{}，住院次数：{} 未找到病案基础数据，暂不进行下载任务！", reportDto.getInpatientNo(), reportDto.getAdmisstimes()); - return; - } - // 判断是否需要保存任务 - AfCollectTask afCollectTask = collectTaskMapper.getTaskById(afReportRecord.getTaskId()); - if (afCollectTask == null) { - afCollectTask = new AfCollectTask(); - afCollectTask.setId(afReportRecord.getTaskId()); - afCollectTask.setC1(reportDto.getSerialnum()); - afCollectTask.setC2(reportDto.getFileTitle()); - afCollectTask.setC3(reportDto.getJzh()); - afCollectTask.setPatientId(patientId); - afCollectTask.setSysflag(reportDto.getSysFlag()); - afCollectTask.setState("0"); - afCollectTask.setPatientId(patientId); - collectTaskMapper.saveTask(afCollectTask); - } - // 都成功后发布下载事件 - applicationContext.publishEvent(new ReportDownEvent(this, afReportRecord.getTaskId())); - } - - @Override - public void makeupReportByTaskIds(List taskIds) throws Exception { - // 定义一批200查询，分批次 - final int oneBatchCount = 200; - int startIndex = 0; - int toIndex = oneBatchCount; - boolean loop = true; - do { - // 获取截取下标 - if (taskIds.size() <= oneBatchCount) { - toIndex = taskIds.size(); - // 最后一批截取 - loop = false; - } - // 截取每一批 - List makeupTaskIds = taskIds.subList(startIndex, toIndex); - makeupTaskIds = afReportRecordMapper.getHasPatientIdTaskIdsByTaskIds(makeupTaskIds); - if (Func.isNotEmpty(makeupTaskIds)) { - for (Long taskId : makeupTaskIds) { - // 发布下载事件 - applicationContext.publishEvent(new ReportDownEvent(this, taskId)); - // 等待防止过快 - TimeUnit.MILLISECONDS.sleep(50); - } - } - // 当截取长度小于集合长度，可以进行下次循环截取 - } while (loop); - } -} diff --git a/src/main/java/com/docus/server/report/util/JSXMLResult.java b/src/main/java/com/docus/server/report/util/JSXMLResult.java deleted file mode 100644 index 7c80654..0000000 --- a/src/main/java/com/docus/server/report/util/JSXMLResult.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.docus.server.report.util; - -import lombok.Data; - -/** - * 嘉时软件自定义 成功/失败消息 XML 格式 - * @author wyb - */ -@Data -public class JSXMLResult { - - private static final String SUCCESS_TEMPLATE="" + - "" + - "0" + - "%s" + - "成功！" + - "" + - ""; - - private static final String FAILED_TEMPLATE="" + - "" + - "500" + - "%s" + - "%s" + - "" + - ""; - - public static String success(String msgId){ - return String.format(SUCCESS_TEMPLATE,msgId); - } - - public static String failed(String msgId,String message){ - return String.format(FAILED_TEMPLATE,msgId,message); - } - - public static void main(String[] args) { - System.out.println(success("100")); - System.out.println(failed("100","随便输出了")); - } - -} diff --git a/src/main/java/com/docus/server/report/webservice/IReportServer.java b/src/main/java/com/docus/server/report/webservice/IReportServer.java deleted file mode 100644 index 99cc0ca..0000000 --- a/src/main/java/com/docus/server/report/webservice/IReportServer.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.docus.server.report.webservice; - -import javax.jws.WebMethod; -import javax.jws.WebService; - -/** - * @author Fang Ruichuan - * @date 2022-11-14 19:03 - */ -@WebService -public interface IReportServer { - /** - * 接收手麻报告信息 - * @param saReportMessage 手麻报告信息 - * @return 返回信息 - */ - String pushSAReport(String saReportMessage); - - /** - * 接收重症报告信息 - * @param icuReportMessage 重症报告信息 - * @return 返回信息 - */ - String pushICUReport(String icuReportMessage); - - /** - * 接收检查报告的信息 - 新增 - * @param inspectionReportMessage 检查报告信息 - 新增 - * @return 成功或者异常信息 - */ - String pushAddInspectionReport(String inspectionReportMessage); - - /** - * 接收检查报告的信息 - 更新 - * @param inspectionReportMessage 检查报告信息 -更新 - * @return 成功或者异常信息 - */ - String pushUpdateInspectionReport(String inspectionReportMessage); -} diff --git a/src/main/java/com/docus/server/report/webservice/impl/SdryReportServerImpl.java b/src/main/java/com/docus/server/report/webservice/impl/SdryReportServerImpl.java deleted file mode 100644 index e80760d..0000000 --- a/src/main/java/com/docus/server/report/webservice/impl/SdryReportServerImpl.java +++ /dev/null @@ -1,529 +0,0 @@ -package com.docus.server.report.webservice.impl; - -import com.alibaba.fastjson.JSONObject; -import com.docus.core.util.DateUtil; -import com.docus.core.util.Func; -import com.docus.infrastructure.core.exception.BaseException; -import com.docus.server.report.dto.ReportDto; -import com.docus.server.report.service.ReportService; -import com.docus.server.report.util.IdUtil; -import com.docus.server.report.util.JSXMLResult; -import com.docus.server.report.util.TableJsonRead; -import com.docus.server.report.util.XmlUtil; -import com.docus.server.report.webservice.IReportServer; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.w3c.dom.Node; - -import javax.annotation.Resource; -import java.util.Date; - -/** - * @author wyb - * @date 2023年3月3日13:42:36 - */ -@Service -@Slf4j -public class SdryReportServerImpl implements IReportServer { - - @Resource - private ReportService reportService; - - @Override - public String pushSAReport(String saReportMessage) { - // 待做 - log.info("收到手麻消息：{}", saReportMessage); - String msgId = ""; - try { - XmlUtil xmlUtil = XmlUtil.of(saReportMessage); - Node msgNode = xmlUtil.getNode("/Request/Msg/ID"); - msgId = msgNode.getTextContent(); - ReportDto reportDto = getReportDtoByJSXML(xmlUtil); - verifyReportDto(reportDto); - reportService.report(reportDto); - return JSXMLResult.success(msgId); - } catch (BaseException baseException) { - log.error(baseException.getMessage(), baseException); - return JSXMLResult.failed(msgId, baseException.getMessage()); - } catch (Exception ex) { - log.error(ex.getMessage(), ex); - return JSXMLResult.failed(msgId, "系统故障！"); - } - } - - - /** - * 嘉时自定义接收接口使用，从xml工具读取返回文件上报需要的数据 - * - * @param xmlUtil xml消息工具封装 - * @return 文件上报数据 - */ - public ReportDto getReportDtoByJSXML(XmlUtil xmlUtil) { - TableJsonRead jsonRead = new TableJsonRead(); - JSONObject tableTypeJson = jsonRead.Read("data-config", "js-table-type.json", JSONObject.class); - String jsReportConfigXml = jsonRead.ReadContent("data-config", "js-report-config.xml"); - XmlUtil configXmlUtil = XmlUtil.of(jsReportConfigXml); - - Node inpatientNoXpathNode = configXmlUtil.getNode("/REPORT/INPATIENT_NO"); - String inpatientNoXpath = inpatientNoXpathNode.getTextContent(); - Node inpatientNoNode = xmlUtil.getNode(inpatientNoXpath); - String inpatientNo = inpatientNoNode.getTextContent(); - - Node jzhXpathNode = configXmlUtil.getNode("/REPORT/JZH"); - String jzhXpath = jzhXpathNode.getTextContent(); - Node jzhNode = xmlUtil.getNode(jzhXpath); - String jzh = jzhNode.getTextContent(); - - Node admissTimesXpathNode = configXmlUtil.getNode("/REPORT/ADMISS_TIMES"); - String admissTimesXpath = admissTimesXpathNode.getTextContent(); - Node admissTimesNode = xmlUtil.getNode(admissTimesXpath); - Integer admissTimes = Integer.valueOf(admissTimesNode.getTextContent()); - - Node serialnumXpathNode = configXmlUtil.getNode("/REPORT/SERIALNUM"); - String serialnumXpath = serialnumXpathNode.getTextContent(); - Node serialnumNode = xmlUtil.getNode(serialnumXpath); - String serialnum = serialnumNode.getTextContent(); - - Node fileTitleXpathNode = configXmlUtil.getNode("/REPORT/FILE_TITLE"); - String fileTitleXpath = fileTitleXpathNode.getTextContent(); - Node fileTitleNode = xmlUtil.getNode(fileTitleXpath); - String fileTitle = fileTitleNode.getTextContent(); - - Node downUrlXpathNode = configXmlUtil.getNode("/REPORT/DOWNURL"); - String downUrlXpath = downUrlXpathNode.getTextContent(); - Node downUrlNode = xmlUtil.getNode(downUrlXpath); - String downUrl = downUrlNode.getTextContent(); - - Node tableTypeXpathNode = configXmlUtil.getNode("/REPORT/TABLE_TYPE"); - String tableTypeXpath = tableTypeXpathNode.getTextContent(); - Node tableTypeNode = xmlUtil.getNode(tableTypeXpath); - String tableType = tableTypeNode.getTextContent(); - - - Node assortIdXpathNode = configXmlUtil.getNode("/REPORT/ASSORT_ID"); - String assortIdXpath = assortIdXpathNode.getTextContent(); - String assortId; - if (Func.isBlank(assortIdXpath)) { - // 如果没有配置 取value 属性，如果value也未配置 取 tableType 对应的json配置，最终方案默认 other 分段 - Node assortIdValueNode = assortIdXpathNode.getAttributes().getNamedItem("value"); - if (Func.isEmpty(assortIdValueNode)) { - assortId = assortIdValueNode.getNodeValue(); - } else { - assortId = tableTypeJson.getString(tableType); - } - if (Func.isBlank(assortId)) { - assortId = tableTypeJson.getString("other"); - } - } else { - Node assortIdNode = xmlUtil.getNode(assortIdXpath); - assortId = assortIdNode.getTextContent(); - } - - Node sysFlagXpathNode = configXmlUtil.getNode("/REPORT/SYSTEM_FLAG"); - String sysFlagXpath = sysFlagXpathNode.getTextContent(); - Node sysFlagNode = xmlUtil.getNode(sysFlagXpath); - String sysFlag = sysFlagNode.getTextContent(); - - Node fileSourceXpathNode = configXmlUtil.getNode("/REPORT/FILESOURCE"); - String fileSourceXpath = fileSourceXpathNode.getTextContent(); - String fileSource; - if (Func.isBlank(fileSourceXpath)) { - Node fileSourceValueNode = fileSourceXpathNode.getAttributes().getNamedItem("value"); - if (Func.isEmpty(fileSourceValueNode)) { - fileSource = null; - } else { - fileSource = fileSourceValueNode.getNodeValue(); - } - - } else { - Node fileSourceNode = xmlUtil.getNode(fileSourceXpath); - fileSource = fileSourceNode.getTextContent(); - } - - - Node fileStorageTypeXpathNode = configXmlUtil.getNode("/REPORT/FILE_STORAGE_TYPE"); - String fileStorageTypeXpath = fileStorageTypeXpathNode.getTextContent(); - String fileStorageType; - if (Func.isBlank(fileStorageTypeXpath)) { - Node filestoragetypeValueNode = fileStorageTypeXpathNode.getAttributes().getNamedItem("value"); - if (Func.isEmpty(filestoragetypeValueNode)) { - fileStorageType = "1"; - } else { - fileStorageType = filestoragetypeValueNode.getNodeValue(); - } - - } else { - Node filestoragetypeNode = xmlUtil.getNode(fileStorageTypeXpath); - fileStorageType = filestoragetypeNode.getTextContent(); - } - - ReportDto reportDto = new ReportDto(); - reportDto.setAdmisstimes(admissTimes); - reportDto.setInpatientNo(inpatientNo); - reportDto.setJzh(jzh); - reportDto.setSerialnum(serialnum); - reportDto.setFileTitle(fileTitle); - reportDto.setDownUrl(downUrl); - reportDto.setAssortId(assortId); - reportDto.setSysFlag(sysFlag); - reportDto.setFileSource(fileSource); - reportDto.setFilestoragetype(fileStorageType); - return reportDto; - } - - @Override - public String pushICUReport(String icuReportMessage) { - log.info("收到重症消息：{}", icuReportMessage); - String msgId = ""; - try { - XmlUtil xmlUtil = XmlUtil.of(icuReportMessage); - Node msgNode = xmlUtil.getNode("/Request/Msg/ID"); - msgId = msgNode.getTextContent(); - ReportDto reportDto = getReportDtoByJSXML(xmlUtil); - verifyReportDto(reportDto); - reportService.report(reportDto); - return JSXMLResult.success(msgId); - } catch (BaseException baseException) { - log.error(baseException.getMessage(), baseException); - return JSXMLResult.failed(msgId, baseException.getMessage()); - } catch (Exception ex) { - log.error(ex.getMessage(), ex); - return JSXMLResult.failed(msgId, "系统故障！"); - } - } - - @Override - public String pushAddInspectionReport(String inspectionReportMessage) { - log.info("收到检查报告新增消息：{}", inspectionReportMessage); - String msgId = ""; - String sender = ""; - String receiver = ""; - try { - XmlUtil xmlUtil = XmlUtil.of(inspectionReportMessage); - msgId = xmlUtil.getNode("/POOR_HIP1008/id/@extension").getNodeValue(); - sender = xmlUtil.getNode("/POOR_HIP1008/sender/device/id/item/@extension").getNodeValue(); - receiver = xmlUtil.getNode("/POOR_HIP1008/receiver/device/id/item/@extension").getNodeValue(); - - ReportDto reportDto = getReportDtoByInspectionInsert(xmlUtil); - verifyReportDto(reportDto); - reportService.report(reportDto); - return insertSuccess(msgId, sender, receiver); - } catch (BaseException baseException) { - log.error(baseException.getMessage(), baseException); - return insertFailed(msgId, sender, receiver, baseException.getMessage()); - } catch (Exception ex) { - log.error(ex.getMessage(), ex); - return insertFailed(msgId, sender, receiver, "系统错误！"); - } - } - - - @Override - public String pushUpdateInspectionReport(String inspectionReportMessage) { - log.info("收到检查报告更新消息{}", inspectionReportMessage); - String msgId = ""; - String sender = ""; - String receiver = ""; - try { - XmlUtil xmlUtil = XmlUtil.of(inspectionReportMessage); - msgId = xmlUtil.getNode("/POOR_HIP1009/id/@extension").getNodeValue(); - sender = xmlUtil.getNode("/POOR_HIP1009/sender/device/id/item/@extension").getNodeValue(); - receiver = xmlUtil.getNode("/POOR_HIP1009/receiver/device/id/item/@extension").getNodeValue(); - - ReportDto reportDto = getReportDtoByInspectionUpdate(xmlUtil); - verifyReportDto(reportDto); - reportService.report(reportDto); - return updateSuccess(msgId, sender, receiver); - } catch (BaseException baseException) { - log.error(baseException.getMessage(), baseException); - return updateFailed(msgId, sender, receiver, baseException.getMessage()); - } catch (Exception ex) { - log.error(ex.getMessage(), ex); - return updateFailed(msgId, sender, receiver, "系统错误"); - } - - } - - /** - * 验证上报文件的信息 - * - * @param reportDto 上报文件的信息 - * @throws BaseException 验证不通过抛出业务异常 - */ - private void verifyReportDto(ReportDto reportDto) throws BaseException { - - if (Func.isBlank(reportDto.getInpatientNo())) { - throw new BaseException("住院号不能为空！"); - } - - if (Func.isEmpty(reportDto.getAdmisstimes()) && Func.isBlank(reportDto.getJzh())) { - throw new BaseException("当住院号与住院次数都为空时，住院流水号/记账号不能为空！"); - } - - if (Func.isBlank(reportDto.getFileTitle())) { - throw new BaseException("文件名不能为空！"); - } - if (Func.isBlank(reportDto.getDownUrl())) { - throw new BaseException("文件下载路径不能为空！"); - } - } - - public ReportDto getReportDtoByInspectionInsert(XmlUtil inspectionInsertXmlUtil) { - - Node inpatientNoNode = inspectionInsertXmlUtil.getNode("/POOR_HIP1008/controlActProcess/subject/recordTarget/patientRole/id[@root='2.16.156.10011.1.12']/@extension"); - String inpatientNo = inpatientNoNode.getNodeValue(); - - Node admissTimesNode = inspectionInsertXmlUtil.getNode("/POOR_HIP1008/controlActProcess/subject/recordTarget/patientRole/item[@root='1.2.156.112635.1.2.1.7']/@extension"); - Integer admissTimes = Integer.valueOf(admissTimesNode.getNodeValue()); - - // 检查报告单号标识 - Node reportFlagNode = inspectionInsertXmlUtil.getNode("/POOR_HIP1008/controlActProcess/subject/recordTarget/patientRole/id[@root='2.16.156.10011.1.32']/@extension"); - String reportFlag = reportFlagNode.getNodeValue(); - //电子申请单编号 - Node eafNoNode = inspectionInsertXmlUtil.getNode("/POOR_HIP1008/controlActProcess/subject/recordTarget/patientRole/id[@root='2.16.156.10011.1.24']/@extension"); - String eafNo = eafNoNode.getNodeValue(); - String serialnum = reportFlag + "@" + eafNo; - - Node assortIdNode = inspectionInsertXmlUtil.getNode("/POOR_HIP1008/controlActProcess/subject/component/structuredBody/component[@displayName='检查报告']/section/entry[@displayName='检查类型']/observation/code/@displayName"); - String assortId = assortIdNode.getNodeValue(); - - Node sysFlagNode = inspectionInsertXmlUtil.getNode("/POOR_HIP1008/controlActProcess/subject/component/structuredBody/component[@displayName='检查报告']/section/entry[@displayName='检查类型']/observation/code/@displayName"); - String sysFlag = sysFlagNode.getNodeValue(); - - Node fileTitleNode = inspectionInsertXmlUtil.getNode("/POOR_HIP1008/controlActProcess/subject/component/structuredBody/component[@displayName='检查报告']/section/entry[@displayName='检查报告类型']/observation/code/@displayName"); - String fileTitle = fileTitleNode.getNodeValue(); - - Node downUrlNode = inspectionInsertXmlUtil.getNode("/POOR_HIP1008/controlActProcess/subject/component/structuredBody/component[@displayName='检查报告图像']/report/entry[@displayName='检查报告图像URL地址']/observation/value"); - String downUrl = downUrlNode.getTextContent(); - - ReportDto reportDto = new ReportDto(); - reportDto.setAdmisstimes(admissTimes); - reportDto.setInpatientNo(inpatientNo); - reportDto.setSerialnum(serialnum); - reportDto.setFileTitle(fileTitle); - reportDto.setDownUrl(downUrl); - reportDto.setAssortId(assortId); - reportDto.setSysFlag(sysFlag); - reportDto.setFileSource("1"); - reportDto.setFilestoragetype("1"); - return reportDto; - } - - public ReportDto getReportDtoByInspectionUpdate(XmlUtil inspectionUpdateXmlUtil) { - Node inpatientNoNode = inspectionUpdateXmlUtil.getNode("/POOR_HIP1009/controlActProcess/subject/recordTarget/patientRole/id[@root='2.16.156.10011.1.12']/@extension"); - String inpatientNo = inpatientNoNode.getNodeValue(); - - Node admissTimesNode = inspectionUpdateXmlUtil.getNode("/POOR_HIP1009/controlActProcess/subject/recordTarget/patientRole/item[@root='1.2.156.112635.1.2.1.7']/@extension"); - Integer admissTimes = Integer.valueOf(admissTimesNode.getNodeValue()); - - // 检查报告单号标识 - Node reportFlagNode = inspectionUpdateXmlUtil.getNode("/POOR_HIP1009/controlActProcess/subject/recordTarget/patientRole/id[@root='2.16.156.10011.1.32']/@extension"); - String reportFlag = reportFlagNode.getNodeValue(); - //电子申请单编号 - Node eafNoNode = inspectionUpdateXmlUtil.getNode("/POOR_HIP1009/controlActProcess/subject/recordTarget/patientRole/id[@root='2.16.156.10011.1.24']/@extension"); - String eafNo = eafNoNode.getNodeValue(); - String serialnum = reportFlag + "@" + eafNo; - - Node assortIdNode = inspectionUpdateXmlUtil.getNode("/POOR_HIP1009/controlActProcess/subject/component/structuredBody/component[@displayName='检查报告']/section/entry[@displayName='检查类型']/observation/code/@displayName"); - String assortId = assortIdNode.getNodeValue(); - - Node sysFlagNode = inspectionUpdateXmlUtil.getNode("/POOR_HIP1009/controlActProcess/subject/component/structuredBody/component[@displayName='检查报告']/section/entry[@displayName='检查类型']/observation/code/@displayName"); - String sysFlag = sysFlagNode.getNodeValue(); - - Node fileTitleNode = inspectionUpdateXmlUtil.getNode("/POOR_HIP1009/controlActProcess/subject/component/structuredBody/component[@displayName='检查报告']/section/entry[@displayName='检查报告类型']/observation/code/@displayName"); - String fileTitle = fileTitleNode.getNodeValue(); - - Node downUrlNode = inspectionUpdateXmlUtil.getNode("/POOR_HIP1009/controlActProcess/subject/component/structuredBody/component[@displayName='检查报告图像']/report/entry[@displayName='检查报告图像URL地址']/observation/value"); - String downUrl = downUrlNode.getTextContent(); - - - ReportDto reportDto = new ReportDto(); - reportDto.setAdmisstimes(admissTimes); - reportDto.setInpatientNo(inpatientNo); - reportDto.setSerialnum(serialnum); - reportDto.setFileTitle(fileTitle); - reportDto.setDownUrl(downUrl); - reportDto.setAssortId(assortId); - reportDto.setSysFlag(sysFlag); - reportDto.setFileSource("1"); - reportDto.setFilestoragetype("1"); - return reportDto; - } - - /** - * 返回检查报告新增成功消息 - * - * @param msgId 消息id - * @param sender 发送路由 - * @param receiver 接收路由 - * @return 新增成功消息响应 - */ - public String insertSuccess(String msgId, String sender, String receiver) { - String createTime = Func.format(new Date(), DateUtil.PATTERN_DATETIME_MINI); - return "\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\n"; - } - - /** - * 返回检查报告插入失败响应消息 - * - * @param msgId 消息id - * @param sender 发送路由 - * @param receiver 接收路由 - * @return 检查报告新增失败响应消息 - */ - public String insertFailed(String msgId, String sender, String receiver, String failedMessage) { - String createTime = Func.format(new Date(), DateUtil.PATTERN_DATETIME_MINI); - return "\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\n"; - } - - /** - * 返回检查报告更新成功响应消息 - * - * @param msgId 消息id - * @param sender 发送路由 - * @param receiver 接收路由 - * @return 更新成功响应消息 - */ - public String updateSuccess(String msgId, String sender, String receiver) { - String createTime = Func.format(new Date(), DateUtil.PATTERN_DATETIME_MINI); - return "\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\n"; - } - - /** - * 检查报告更新失败响应 - * - * @param msgId 消息id - * @param sender 发送路由 - * @param receiver 接收路由 - * @param failedMessage 失败信息 - * @return 更新失败响应信息 - */ - public String updateFailed(String msgId, String sender, String receiver, String failedMessage) { - String createTime = Func.format(new Date(), DateUtil.PATTERN_DATETIME_MINI); - return "\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\n"; - } -} diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml index 37a4528..2444440 100644 --- a/src/main/resources/bootstrap.yml +++ b/src/main/resources/bootstrap.yml @@ -30,7 +30,7 @@ spring: redis: host: redis.docus.cn -# password: JSdocus@702 + password: JSdocus@702 cloud: nacos: discovery: @@ -45,9 +45,14 @@ spring: docus: + url: + # 采集任务补偿地址 + compensate-task-url: http://localhost:9295/api/NoViewCollect/compensateTask + # 下载地址 + down-url: http://localhost:9291/api/downplatform/report + + dbtype: mysql - report: - downurl: http://localhost:9291/api/downplatform/report mybatis-plus: configuration: @@ -64,7 +69,7 @@ xxl: admin: addresses: http://job.docus.cn:8180/xxl-job-admin executor: - appname: docus-webservice-report + appname: docus-unified-message address: ip: port: 19312 diff --git a/src/main/resources/mapper/AfCollectTaskMapper.xml b/src/main/resources/mapper/AfCollectTaskMapper.xml deleted file mode 100644 index bb4b4c1..0000000 --- a/src/main/resources/mapper/AfCollectTaskMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - INSERT INTO `docus_archivefile`.`af_collect_task`(`id`, `patient_id`, `sysflag`, - `state`, `C1`,`C2`, `C3`) - VALUES (#{task.id}, #{task.patientId}, #{task.sysflag}, '0', #{task.C1}, #{task.C2}, #{task.C3}); - - - - diff --git a/src/main/resources/mapper/AfReportRecordMapper.xml b/src/main/resources/mapper/AfReportRecordMapper.xml deleted file mode 100644 index eddd271..0000000 --- a/src/main/resources/mapper/AfReportRecordMapper.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - INSERT INTO `docus_archivefile`.`af_report_record`(`task_id`, `inpatient_no`, `jzh`, `admiss_times`, `down_url`, - `down_type`, `state`, `serialnum`, `sysflag`, `zd_assort_id`, - `create_time`, `update_time`, `file_name`, `patient_id`) - VALUES (#{reportRecord.taskId}, #{reportRecord.inpatientNo}, #{reportRecord.jzh}, #{reportRecord.admissTimes}, - #{reportRecord.downUrl}, #{reportRecord.downType}, 0, #{reportRecord.serialnum}, - #{reportRecord.sysflag}, #{reportRecord.zdAssortId}, now(), now(), #{reportRecord.fileName}, - #{reportRecord.patientId}); - - - update `docus_archivefile`.`af_report_record` - set `down_url`=#{reportRecord.downUrl}, - `down_type`=#{reportRecord.downType}, - `state`=0, - `file_name`=#{reportRecord.fileName}, - `patient_id`=#{reportRecord.patientId}, - `update_time`=now() - where `task_id` = #{reportRecord.taskId} - - - update `docus_archivefile`.`af_report_record` - set `state`= 1, - `update_time`=now() - where `task_id` = #{taskId} - - - - - diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml deleted file mode 100644 index ea06ea3..0000000 --- a/src/main/resources/mapper/TBasicMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/src/test/java/com/docus/server/report/webservice/impl/SdryReportServerImplTest.java b/src/test/java/com/docus/server/report/webservice/impl/SdryReportServerImplTest.java deleted file mode 100644 index 5ea0556..0000000 --- a/src/test/java/com/docus/server/report/webservice/impl/SdryReportServerImplTest.java +++ /dev/null @@ -1,1083 +0,0 @@ -package com.docus.server.report.webservice.impl; - -import com.docus.server.report.dto.ReportDto; -import com.docus.server.report.util.XmlUtil; -import org.junit.Before; -import org.junit.Test; - -/** - * @author wyb - * @date 2023年3月3日13:42:36 - */ -public class SdryReportServerImplTest { - SdryReportServerImpl reportServer; - @Before - public void init(){ - this.reportServer = new SdryReportServerImpl(); - } - - @Test - public void getReportDtoByJSXMLTest(){ - - XmlUtil xmlUtil = XmlUtil.of( - "\n" + - "\n" + - "\n" + - "123456\n" + - "\n" + - "012345\n" + - "\n" + - "012345\n" + - "\n" + - "2\n" + - "\n" + - "icu\n" + - "\n" + - "20220303111800\n" + - "\n" + - "20220303111801\n" + - "\n" + - "http://192.168.1.108:9012/file/0123_01.pdf\n" + - "\n" + - "0123_01\n" + - "\n" + - "AESHASHMD5DEFIND\n" + - "\n" + - "\n"); - ReportDto reportDtoByJSXML = reportServer.getReportDtoByJSXML(xmlUtil); - System.out.println(reportDtoByJSXML); - - } - - - @Test - public void getReportDtoByInspectionUpdateXMLTest(){ - XmlUtil updateUtil = XmlUtil.of("\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t黄杏婵\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t南方医科大学顺德医院\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t肾内科\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t3号楼5楼病区\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t南方医科大学顺德医院\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t主诉及病史：低血压后神志不清一小时 体查：双侧巴氏征阳性 既往史：糖尿病肾病、血液透析 其他检查：见检验单 临床诊断：急性脑血管意外\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t主诉及病史：低血压后神志不清一小时 体查：双侧巴氏征阳性 既往史：糖尿病肾病、血液透析 其他检查：见检验单 临床诊断：急性脑血管意外\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\tF\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\tDR\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t1. 心影较前增大，右肺门较前膨隆，原双肺渗出灶及双侧少量胸积液较前吸收，宜结合临床。 2. 主动脉硬化。 3. 右乳钙化灶。\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t床边胸片\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t无\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t无\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t无\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\tnmol/L\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t对比2023-02-21前片： 　　双肺纹理增多稍粗，原双下肺斑片状模糊影较前吸收；右肺门较前膨隆，纵隔增宽。心影较前增大，左侧缘显示不清，主动脉弓部见钙化影。右侧膈面光滑，肋膈角锐利。右侧深静脉插管置于T4水平。右乳钙化灶。\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t1. 心影较前增大，右肺门较前膨隆，原双肺渗出灶及双侧少量胸积液较前吸收，宜结合临床。 2. 主动脉硬化。 3. 右乳钙化灶。\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t放射科\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t南方医科大学顺德医院\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t0436123\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\thttp://192.168.5.51/ClinicView/html/report.htm?exam_no=0002203361&report_no=1\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t0002203361-1.pdf\n" + - "\t\t\t\t\t\t\t\t\tpdf\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\n"); - System.out.println(reportServer.getReportDtoByInspectionUpdate(updateUtil)); - } - - - @Test - public void getReportDtoByInspectionInsertXMLTest(){ - XmlUtil insertUtil = XmlUtil.of("\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t曾惠贞\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t南方医科大学顺德医院\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t乳腺外科\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t2号楼16楼东区\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t南方医科大学顺德医院\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t主诉及病史:乳腺癌术后复查 体查:乳腺癌术后复查 既往史：乳腺癌术后复查 其他检查:乳腺癌术后复查 临床诊断:乳腺癌术后复查\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t主诉及病史:乳腺癌术后复查 体查:乳腺癌术后复查 既往史：乳腺癌术后复查 其他检查:乳腺癌术后复查 临床诊断:乳腺癌术后复查\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\tF\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t磁共振\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t　　1、双侧基底节区多发腔隙性脑梗塞。 　　2、脑萎缩。\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\tMR1.5颅脑平扫\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t无\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t无\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t无\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\tnmol/L\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t　　双侧基底节区见多发斑点状等T1稍长T2信号，FLAIR为高信号。双侧脑室系统扩张。脑沟脑裂部分增宽。中线结构居中。\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t　　1、双侧基底节区多发腔隙性脑梗塞。 　　2、脑萎缩。\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t核磁共振\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t南方医科大学顺德医院\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t
\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\tMR053370\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\thttp://192.168.5.51/ClinicView/html/report.htm?exam_no=0002203448&report_no=1\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\t0002203448-1.pdf\n" + - "\t\t\t\t\t\t\t\t\tpdf\n" + - "\t\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\n" + - "\t\t\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\n"); - System.out.println(reportServer.getReportDtoByInspectionInsert(insertUtil)); - } - - - - - - - - -}