diff --git a/collect-sdry/src/main/java/com/docus/server/collect/WsResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/WsResultImpl.java index 22fd415..d4a17f0 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/WsResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/WsResultImpl.java @@ -9,7 +9,7 @@ import java.util.Map; public class WsResultImpl implements IWsResult { @Override - public String ok(Map params) { + public String ok(Map params) { return null; } diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/HttpTBasicCollectServiceImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/HttpTBasicCollectServiceImpl.java new file mode 100644 index 0000000..f9f95f6 --- /dev/null +++ b/collect-sdry/src/main/java/com/docus/server/collect/basic/HttpTBasicCollectServiceImpl.java @@ -0,0 +1,20 @@ +package com.docus.server.collect.basic; + +import com.docus.server.collect.service.IHttpTBasicCollectService; +import com.docus.server.record.pojo.dto.TBasicDTO; +import com.google.common.collect.Lists; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +@Service +public class HttpTBasicCollectServiceImpl implements IHttpTBasicCollectService { + @Override + public List getTBasics(Date startDate, Date endDate, long pageNum, long pageSize) { + TBasicDTO deptDTO = new TBasicDTO(); + + TBasicDTO deptDTO1 = new TBasicDTO(); + return Lists.newArrayList(deptDTO, deptDTO1); + } +} diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/HttpDeptCollectServiceImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/HttpDeptCollectServiceImpl.java index 3f414c8..8b858fe 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/dept/HttpDeptCollectServiceImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/HttpDeptCollectServiceImpl.java @@ -1,7 +1,7 @@ package com.docus.server.collect.dept; -import com.docus.server.collect.service.IHttpTBasicCollectService; -import com.docus.server.sys.pojo.dto.DeptDTO; +import com.docus.server.collect.service.IHttpDeptCollectService; +import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.google.common.collect.Lists; import org.springframework.stereotype.Service; @@ -9,7 +9,7 @@ import java.util.Date; import java.util.List; @Service -public class HttpDeptCollectServiceImpl implements IHttpTBasicCollectService { +public class HttpDeptCollectServiceImpl implements IHttpDeptCollectService { @Override public List getDepts(Date startDate, Date endDate, long pageNum, long pageSize) { DeptDTO deptDTO = new DeptDTO(); diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/JmsIbmMqDeptCollectServiceImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/JmsIbmMqDeptCollectServiceImpl.java new file mode 100644 index 0000000..19cd1c6 --- /dev/null +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/JmsIbmMqDeptCollectServiceImpl.java @@ -0,0 +1,78 @@ +package com.docus.server.collect.dept; + +import com.docus.core.util.XmlUtil; +import com.docus.server.collect.mq.dept.AbstractDeptMqCollectService; +import com.docus.server.sys.common.pojo.dto.DeptDTO; +import org.springframework.stereotype.Service; +import org.w3c.dom.Node; + +@Service +public class JmsIbmMqDeptCollectServiceImpl extends AbstractDeptMqCollectService { + + /** + * 监听注解订阅，自己编写 + * + * @param message 科室信息 + */ + //@JmsIbmListener(destination = "TJ_createDepartment") + @Override + public void addDept(String message) { + super.addDept(message); + } + + /** + * 监听注解订阅，自己编写 + * + * @param message 科室信息 + */ + //@JmsIbmListener(destination = "TJ_updateDepartment") + @Override + public void updateDept(String message) { + super.updateDept(message); + } + + /** + * 解析新增的消息, 下面是个例子 + * + * @param xml + * @return + */ + @Override + public DeptDTO parseAddDeptXml(String xml) { + XmlUtil xmlParseUtil = XmlUtil.of(xml); + Node deptCodeNode = xmlParseUtil.getNode("/PRPM_IN401030UV01/controlActProcess/subject/registrationRequest/subject1/assignedEntity/id/item/@extension"); + Node deptNameNode = xmlParseUtil.getNode("/PRPM_IN401030UV01/controlActProcess/subject/registrationRequest/subject1/assignedEntity/assignedPrincipalOrganization/name/item[@use='OR']/part/@value"); + Node authorIdNode = xmlParseUtil.getNode("/PRPM_IN401030UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/id/item/@extension"); + Node authorNameNode = xmlParseUtil.getNode("/PRPM_IN401030UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/assignedPerson/name/item/part/@value"); + + DeptDTO deptDto = new DeptDTO(); + deptDto.setDeptCode(deptCodeNode.getNodeValue()); + deptDto.setDeptName(deptNameNode.getNodeValue()); + deptDto.setAuthorId(authorIdNode.getNodeValue()); + deptDto.setAuthorName(authorNameNode.getNodeValue()); + return deptDto; + } + + /** + * 解析更新的消息, 下面是个例子 + * + * @param xml + * @return + */ + @Override + public DeptDTO parseUpdateDeptXml(String xml) { + XmlUtil xmlParseUtil = XmlUtil.of(xml); + Node deptCodeNode = xmlParseUtil.getNode("/PRPM_IN403010UV01/controlActProcess/subject/registrationRequest/subject1/assignedEntity/id/item/@extension"); + Node deptNameNode = xmlParseUtil.getNode("/PRPM_IN403010UV01/controlActProcess/subject/registrationRequest/subject1/assignedEntity/assignedPrincipalOrganization/name/item[@use='OR']/part/@value"); + Node authorIdNode = xmlParseUtil.getNode("/PRPM_IN403010UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/id/item/@extension"); + Node authorNameNode = xmlParseUtil.getNode("/PRPM_IN403010UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/assignedPerson/name/item/part/@value"); + + DeptDTO deptDto = new DeptDTO(); + deptDto.setDeptCode(deptCodeNode.getNodeValue()); + deptDto.setDeptName(deptNameNode.getNodeValue()); + deptDto.setAuthorId(authorIdNode.getNodeValue()); + deptDto.setAuthorName(authorNameNode.getNodeValue()); + return deptDto; + } + +} diff --git a/collect-sdry/src/main/java/com/docus/server/collect/medical/record/ParseServiceImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/medical/record/ParseServiceImpl.java index 37afdd6..4eb2650 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/medical/record/ParseServiceImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/medical/record/ParseServiceImpl.java @@ -1,9 +1,11 @@ package com.docus.server.collect.medical.record; +import com.docus.core.util.XmlUtil; import com.docus.server.collect.service.IParseService; import com.docus.server.record.pojo.entity.MedicalRecord; -import com.docus.server.sys.service.Dept; +import com.docus.server.sys.common.pojo.dto.DeptDTO; import org.springframework.stereotype.Service; +import org.w3c.dom.Node; @Service public class ParseServiceImpl implements IParseService { @@ -15,9 +17,32 @@ public class ParseServiceImpl implements IParseService { } + /** + * 新增/修改 科室解析 webservice 例子 + * + * @param deptXml + * @return + */ @Override - public Dept parseDeptXml(String deptXml) { + public DeptDTO parseDeptXml(String deptXml) { //TODO： 根据协议进行解析。 - return null; + XmlUtil xmlParseUtil = XmlUtil.of(deptXml); + Node msgIdNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/id/@extension"); + Node receiverNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/receiver/device/id/item/@extension"); + Node operateTypeNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/@operateType"); + Node deptCodeNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/DEPT_CODE/@value"); + Node deptNameNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/DEPT_NAME/@value"); + Node authorIdNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/id/item/@extension"); + Node authorNameNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/assignedPerson/name/item/part/@value"); + + DeptDTO deptDto = new DeptDTO(); + deptDto.setMessageId(msgIdNode.getNodeValue()); + deptDto.setReceiver(receiverNode.getNodeValue()); + deptDto.setOperateType(operateTypeNode.getNodeValue()); + deptDto.setDeptCode(deptCodeNode.getNodeValue()); + deptDto.setDeptName(deptNameNode.getNodeValue()); + deptDto.setAuthorId(authorIdNode.getNodeValue()); + deptDto.setAuthorName(authorNameNode.getNodeValue()); + return deptDto; } } diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/HttpUserCollectServiceImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/user/HttpUserCollectServiceImpl.java index a2228ea..fd4e265 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/user/HttpUserCollectServiceImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/HttpUserCollectServiceImpl.java @@ -1,7 +1,7 @@ package com.docus.server.collect.user; import com.docus.server.collect.service.IHttpUserCollectService; -import com.docus.server.sys.pojo.dto.UserDTO; +import com.docus.server.sys.common.pojo.dto.UserDTO; import com.google.common.collect.Lists; import org.springframework.stereotype.Service; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/JmsIbmMqUserCollectServiceImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/user/JmsIbmMqUserCollectServiceImpl.java new file mode 100644 index 0000000..50cacf5 --- /dev/null +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/JmsIbmMqUserCollectServiceImpl.java @@ -0,0 +1,88 @@ +package com.docus.server.collect.user; + +import com.docus.core.util.XmlUtil; +import com.docus.server.collect.mq.user.AbstractUserMqCollectService; +import com.docus.server.sys.common.pojo.dto.UserDTO; +import org.springframework.stereotype.Service; +import org.w3c.dom.Node; + +@Service +public class JmsIbmMqUserCollectServiceImpl extends AbstractUserMqCollectService { + /** + * 监听注解订阅，自己编写 + * + * @param message 科室信息 + */ + //@JmsIbmListener(destination = "TJ_createPractitioner") + @Override + public void addUser(String message) { + super.addUser(message); + } + + /** + * 监听注解订阅，自己编写 + * + * @param message 科室信息 + */ + //@JmsIbmListener(destination = "TJ_updatePractitioner") + @Override + public void updateUser(String message) { + super.updateUser(message); + } + + /** + * 解析新增的消息, 下面是个例子 + * + * @param xml + * @return + */ + @Override + public UserDTO parseAddUserXml(String xml) { + XmlUtil xmlParseUtil = XmlUtil.of(xml); + Node employeeCodeNode = xmlParseUtil.getNode("/PRPM_IN301010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/id/item/@extension"); + Node employeeNameNode = xmlParseUtil.getNode("/PRPM_IN301010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/healthCarePrincipalPerson/name/item[@use='OR']/part/@value"); + Node deptCodeNode = xmlParseUtil.getNode("/PRPM_IN301010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/healthCarePrincipalPerson/asAffiliate/affiliatedPrincipalOrganization/id/item/@extension"); + Node positionNode = xmlParseUtil.getNode("/PRPM_IN301010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/relatedTo/assignedEntity/relatedTo/assignedEntity/code[@codeSystem='2.16.156.10011.0.9.2.3.2.122']/displayName/@value"); + Node authorIdNode = xmlParseUtil.getNode("/PRPM_IN301010UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/id/item/@extension"); + Node authorNameNode = xmlParseUtil.getNode("/PRPM_IN301010UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/assignedPerson/name/item/part/@value"); + + UserDTO userDto = new UserDTO(); + userDto.setDeptId(deptCodeNode.getNodeValue()); + userDto.setUserName(employeeCodeNode.getNodeValue()); + userDto.setName(employeeNameNode.getNodeValue()); + userDto.setPosition(positionNode.getNodeValue()); + userDto.setAuthorId(authorIdNode.getNodeValue()); + userDto.setAuthorName(authorNameNode.getNodeValue()); + userDto.setRoleId(0L); + return userDto; + } + + /** + * 解析更新的消息, 下面是个例子 + * + * @param xml + * @return + */ + @Override + public UserDTO parseUpdateUserXml(String xml) { + XmlUtil xmlParseUtil = XmlUtil.of(xml); + Node employeeCodeNode = xmlParseUtil.getNode("/PRPM_IN303010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/id/item/@extension"); + Node employeeNameNode = xmlParseUtil.getNode("/PRPM_IN303010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/healthCarePrincipalPerson/name/item[@use='OR']/part/@value"); + Node deptCodeNode = xmlParseUtil.getNode("/PRPM_IN303010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/healthCarePrincipalPerson/asAffiliate/affiliatedPrincipalOrganization/id/item/@extension"); + Node positionNode = xmlParseUtil.getNode("/PRPM_IN303010UV01/controlActProcess/subject/registrationRequest/subject1/healthCareProvider/relatedTo/assignedEntity/relatedTo/assignedEntity/code[@codeSystem='2.16.156.10011.0.9.2.3.2.122']/displayName/@value"); + Node authorIdNode = xmlParseUtil.getNode("/PRPM_IN303010UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/id/item/@extension"); + Node authorNameNode = xmlParseUtil.getNode("/PRPM_IN303010UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/assignedPerson/name/item/part/@value"); + + UserDTO userDto = new UserDTO(); + userDto.setDeptId(deptCodeNode.getNodeValue()); + userDto.setUserName(employeeCodeNode.getNodeValue()); + userDto.setName(employeeNameNode.getNodeValue()); + userDto.setPosition(positionNode.getNodeValue()); + userDto.setAuthorId(authorIdNode.getNodeValue()); + userDto.setAuthorName(authorNameNode.getNodeValue()); + userDto.setRoleId(0L); + return userDto; + } + + +} diff --git a/collect-sdry/src/main/resources/bootstrap.yml b/collect-sdry/src/main/resources/bootstrap.yml index 5d939e8..21e0cbf 100644 --- a/collect-sdry/src/main/resources/bootstrap.yml +++ b/collect-sdry/src/main/resources/bootstrap.yml @@ -12,19 +12,21 @@ spring: datasource: master: url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_archivefile?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: root - password: root + username: docus + password: docus702 driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource his: - url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: root - password: root + url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_archivefile?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai + username: docus + password: docus702 driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource + + redis: host: redis.docus.cn - # password: JSdocus@702 + password: JSdocus@702 cloud: nacos: discovery: @@ -37,6 +39,7 @@ spring: shared-configs: - comm.${spring.cloud.nacos.config.file-extension} + docus: dbtype: mysql @@ -44,33 +47,34 @@ mybatis-plus: configuration: map-underscore-to-camel-case: true call-setters-on-nulls: true - jdbc-type-for-null: null log-impl: org.apache.ibatis.logging.stdout.StdOutImpl global-config: db-config: - update-strategy: ignored field-strategy: NOT_EMPTY db-type: MYSQL - mapper-locations: classpath*:/mapper/*Mapper.xml - xxl: job: accessToken: admin: addresses: http://job.docus.cn:8180/xxl-job-admin executor: - appname: xxl-job-executor-test + appname: docus-inspection address: ip: port: 17781 logretentiondays: 30 logpath: D:/xxl-job/inspection -api: - soft-delete-column-name=state - soft-delete-column-value=1 -logging: - level: - com: - baomidou: - mybatisplus: DEBUG +# +#ibm: +# mq: +# queueManager: MqManager01 +# channel: chl_server01 +# connName: 10.222.23.130(1414) +# ackUrl: 10.222.23.159:7800/ack +# domain: CDR +# key: cdr-0012-adef +# replica: +# queueManager: MqManager02 +# channel: chl_server02 +# connName: 10.222.23.131(1414) \ No newline at end of file diff --git a/common-collect/src/main/java/com/docus/server/collect/infrastructure/mapper/TaskConfigMapper.java b/common-collect/src/main/java/com/docus/server/collect/infrastructure/mapper/TaskConfigMapper.java index 4f85347..c5cfcb6 100644 --- a/common-collect/src/main/java/com/docus/server/collect/infrastructure/mapper/TaskConfigMapper.java +++ b/common-collect/src/main/java/com/docus/server/collect/infrastructure/mapper/TaskConfigMapper.java @@ -4,10 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.docus.server.collect.domain.TaskConfig; import org.apache.ibatis.annotations.Mapper; -/** - * @Author : linrf - * @create 2023/5/30 9:11 - */ @Mapper public interface TaskConfigMapper extends BaseMapper { } diff --git a/common-collect/src/main/java/com/docus/server/collect/job/basic/AbstractTBasicCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/job/basic/AbstractTBasicCollectJob.java index 5fe6b88..ef2e3d2 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/basic/AbstractTBasicCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/job/basic/AbstractTBasicCollectJob.java @@ -3,8 +3,8 @@ package com.docus.server.collect.job.basic; import com.docus.core.util.Func; import com.docus.server.collect.domain.TaskConfig; import com.docus.server.collect.service.ITaskConfigService; -import com.docus.server.sys.pojo.dto.TBasicDTO; -import com.docus.server.sys.service.ITBasicService; +import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.service.ITBasicService; import com.docus.server.tool.PeriodTime; import com.xxl.job.core.context.XxlJobHelper; import org.springframework.beans.factory.annotation.Autowired; @@ -32,7 +32,7 @@ public abstract class AbstractTBasicCollectJob { List periodTimes = taskConfig.getAllPeriodTimes(); for (PeriodTime periodTime : periodTimes) { - doGetDepts(periodTime, taskConfig); + getTBasic(periodTime, taskConfig); taskConfigService.updateAllPointerDate(taskConfigId, periodTime.getPeriodEndDate()); } } @@ -45,7 +45,7 @@ public abstract class AbstractTBasicCollectJob { List periodTimes = taskConfig.getIncPeriodTimes(); periodTimes.forEach(periodTime -> { - doGetDepts(periodTime, taskConfig); + getTBasic(periodTime, taskConfig); taskConfigService.updateIncPointerDate(taskConfigId, periodTime.getPeriodEndDate()); }); @@ -61,26 +61,27 @@ public abstract class AbstractTBasicCollectJob { * @param periodTime * @param taskConfig */ - private void doGetDepts(PeriodTime periodTime, TaskConfig taskConfig) { + private void getTBasic(PeriodTime periodTime, TaskConfig taskConfig) { //考虑到性能，应该把起始时间和结束时间进行切割拆分到每天。按段查询。 - List depts; + List basics; int pageNum = 1; for (; true; pageNum++) { - depts = this.getBasics( - periodTime.getPeriodStartDate(), - periodTime.getPeriodEndDate(), - pageNum, - taskConfig.getPageSize() + basics = this.getTBasics( + periodTime.getPeriodStartDate(), + periodTime.getPeriodEndDate(), + pageNum, + taskConfig.getPageSize() ); - if (Func.isEmpty(depts)) { + if (Func.isEmpty(basics)) { break; } - basicService.batchSaveBasics(depts); + //保存 + basicService.batchSaveBasics(basics); } } /** - * 需要去适配获取部门信息 + * 需要去适配获取病患信息 * * @param startDate * @param endDate @@ -88,7 +89,7 @@ public abstract class AbstractTBasicCollectJob { * @param pageSize * @return */ - public abstract List getBasics(Date startDate, Date endDate, long pageNum, long pageSize); + public abstract List getTBasics(Date startDate, Date endDate, long pageNum, long pageSize); } diff --git a/common-collect/src/main/java/com/docus/server/collect/job/basic/TBasicHttpCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/job/basic/TBasicHttpCollectJob.java index 9ee1f12..9bcbe40 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/basic/TBasicHttpCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/job/basic/TBasicHttpCollectJob.java @@ -2,8 +2,8 @@ package com.docus.server.collect.job.basic; import com.docus.server.collect.service.IHttpTBasicCollectService; import com.docus.server.collect.service.ITaskConfigService; -import com.docus.server.sys.pojo.dto.TBasicDTO; -import com.docus.server.sys.service.ITBasicService; +import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.service.ITBasicService; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -16,17 +16,17 @@ import java.util.List; public class TBasicHttpCollectJob extends AbstractTBasicCollectJob { @Resource - private final IHttpTBasicCollectService httpDeptCollectService; + private final IHttpTBasicCollectService iHttpTBasicCollectService; - public TBasicHttpCollectJob(ITBasicService deptService, ITaskConfigService taskConfigService, IHttpTBasicCollectService httpDeptCollectService) { + public TBasicHttpCollectJob(ITBasicService deptService, ITaskConfigService taskConfigService, IHttpTBasicCollectService iHttpTBasicCollectService) { super(deptService, taskConfigService); - this.httpDeptCollectService = httpDeptCollectService; + this.iHttpTBasicCollectService = iHttpTBasicCollectService; } /** * xxl jobhandler 手工执行 */ - @XxlJob("startAllDeptHttpCollect") + @XxlJob("startAllTBasicHttpCollect") public void startAllDeptHttpCollect() { super.startCollectAll(getJobParam()); } @@ -34,17 +34,17 @@ public class TBasicHttpCollectJob extends AbstractTBasicCollectJob { /** * xxl jobhandler 配置定时启动，如果未完成任务跳过。 */ - @XxlJob("startIncDeptHttpCollect") + @XxlJob("startIncTBasicHttpCollect") public void startIncDeptHttpCollect() { super.startCollectIncrement(getJobParam()); } @Override - public List getBasics(Date startDate, Date endDate, long pazeNum, long pageSize) { + public List getTBasics(Date startDate, Date endDate, long pazeNum, long pageSize) { //需要根据不同医院去解析不同的内容。使用接口实现的方式。 - return httpDeptCollectService.getDepts(startDate, endDate, pazeNum, pageSize); + return iHttpTBasicCollectService.getTBasics(startDate, endDate, pazeNum, pageSize); } } diff --git a/common-collect/src/main/java/com/docus/server/collect/job/basic/TBasicViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/job/basic/TBasicViewCollectJob.java index b551145..11b2dc8 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/basic/TBasicViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/job/basic/TBasicViewCollectJob.java @@ -2,8 +2,8 @@ package com.docus.server.collect.job.basic; import com.docus.server.collect.service.ITaskConfigService; import com.docus.server.his.service.IHisService; -import com.docus.server.sys.pojo.dto.DeptDTO; -import com.docus.server.sys.service.ITBasicService; +import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.record.service.ITBasicService; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -24,7 +24,7 @@ public class TBasicViewCollectJob extends AbstractTBasicCollectJob { /** * xxl jobhandler 手工执行，全量执行 */ - @XxlJob("startAllDeptViewCollect") + @XxlJob("startAllTBasicViewCollect") public void startAllDeptViewCollect() { super.startCollectAll(getJobParam()); } @@ -33,17 +33,17 @@ public class TBasicViewCollectJob extends AbstractTBasicCollectJob { /** * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集 */ - @XxlJob("startIncDeptViewCollect") + @XxlJob("startIncTBasicViewCollect") public void startIncDeptViewCollect() { super.startCollectIncrement(getJobParam()); } @Override - public List getBasics(Date startDate, Date endDate, long pageNum, long pageSize) { + public List getTBasics(Date startDate, Date endDate, long pageNum, long pageSize) { //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。 - return hisService.getDeptListView(startDate, endDate, pageNum, pageSize); + return hisService.getTBasicListView(startDate, endDate, pageNum, pageSize); } } diff --git a/common-collect/src/main/java/com/docus/server/collect/job/dept/AbstractDeptCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/job/dept/AbstractDeptCollectJob.java index 731e4cf..e5eba59 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/dept/AbstractDeptCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/job/dept/AbstractDeptCollectJob.java @@ -1,10 +1,10 @@ package com.docus.server.collect.job.dept; import com.docus.core.util.Func; -import com.docus.server.collect.service.ITaskConfigService; import com.docus.server.collect.domain.TaskConfig; -import com.docus.server.sys.pojo.dto.DeptDTO; -import com.docus.server.sys.service.ITBasicService; +import com.docus.server.collect.service.ITaskConfigService; +import com.docus.server.sys.common.pojo.dto.DeptDTO; +import com.docus.server.sys.service.IPowerDeptService; import com.docus.server.tool.PeriodTime; import com.xxl.job.core.context.XxlJobHelper; import org.springframework.beans.factory.annotation.Autowired; @@ -15,11 +15,11 @@ import java.util.List; public abstract class AbstractDeptCollectJob { @Autowired - private final ITBasicService deptService; + private final IPowerDeptService deptService; @Resource private final ITaskConfigService taskConfigService; - protected AbstractDeptCollectJob(ITBasicService deptService, ITaskConfigService taskConfigService) { + protected AbstractDeptCollectJob(IPowerDeptService deptService, ITaskConfigService taskConfigService) { this.deptService = deptService; this.taskConfigService = taskConfigService; } @@ -67,15 +67,15 @@ public abstract class AbstractDeptCollectJob { int pageNum = 1; for (; true; pageNum++) { depts = this.getDepts( - periodTime.getPeriodStartDate(), - periodTime.getPeriodEndDate(), - pageNum, - taskConfig.getPageSize() + periodTime.getPeriodStartDate(), + periodTime.getPeriodEndDate(), + pageNum, + taskConfig.getPageSize() ); if (Func.isEmpty(depts)) { break; } - deptService.batchSaveBasics(depts); + deptService.batchSaveOrUpdatePowerDept(depts); } } diff --git a/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptHttpCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptHttpCollectJob.java index f18d222..c3df08b 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptHttpCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptHttpCollectJob.java @@ -1,9 +1,9 @@ package com.docus.server.collect.job.dept; +import com.docus.server.collect.service.IHttpDeptCollectService; import com.docus.server.collect.service.ITaskConfigService; -import com.docus.server.collect.service.IHttpTBasicCollectService; -import com.docus.server.sys.pojo.dto.DeptDTO; -import com.docus.server.sys.service.ITBasicService; +import com.docus.server.sys.common.pojo.dto.DeptDTO; +import com.docus.server.sys.service.IPowerDeptService; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -16,9 +16,9 @@ import java.util.List; public class DeptHttpCollectJob extends AbstractDeptCollectJob { @Resource - private final IHttpTBasicCollectService httpDeptCollectService; + private final IHttpDeptCollectService httpDeptCollectService; - public DeptHttpCollectJob(ITBasicService deptService, ITaskConfigService taskConfigService, IHttpTBasicCollectService httpDeptCollectService) { + public DeptHttpCollectJob(IPowerDeptService deptService, ITaskConfigService taskConfigService, IHttpDeptCollectService httpDeptCollectService) { super(deptService, taskConfigService); this.httpDeptCollectService = httpDeptCollectService; } diff --git a/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptViewCollectJob.java index 00ece25..13519c6 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptViewCollectJob.java @@ -2,8 +2,8 @@ package com.docus.server.collect.job.dept; import com.docus.server.collect.service.ITaskConfigService; import com.docus.server.his.service.IHisService; -import com.docus.server.sys.pojo.dto.DeptDTO; -import com.docus.server.sys.service.ITBasicService; +import com.docus.server.sys.common.pojo.dto.DeptDTO; +import com.docus.server.sys.service.IPowerDeptService; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -16,7 +16,7 @@ public class DeptViewCollectJob extends AbstractDeptCollectJob { @Resource private final IHisService hisService; - protected DeptViewCollectJob(ITBasicService deptService, ITaskConfigService taskConfigService, IHisService hisService) { + protected DeptViewCollectJob(IPowerDeptService deptService, ITaskConfigService taskConfigService, IHisService hisService) { super(deptService, taskConfigService); this.hisService = hisService; } diff --git a/common-collect/src/main/java/com/docus/server/collect/job/user/AbstractUserCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/job/user/AbstractUserCollectJob.java index ffa784e..107c9b6 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/user/AbstractUserCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/job/user/AbstractUserCollectJob.java @@ -3,7 +3,7 @@ package com.docus.server.collect.job.user; import com.docus.core.util.Func; import com.docus.server.collect.domain.TaskConfig; import com.docus.server.collect.service.ITaskConfigService; -import com.docus.server.sys.pojo.dto.UserDTO; +import com.docus.server.sys.common.pojo.dto.UserDTO; import com.docus.server.sys.service.IPowerUserService; import com.docus.server.tool.PeriodTime; import com.xxl.job.core.context.XxlJobHelper; @@ -67,20 +67,20 @@ public abstract class AbstractUserCollectJob { int pageNum = 1; for (; true; pageNum++) { users = this.getUsers( - periodTime.getPeriodStartDate(), - periodTime.getPeriodEndDate(), - pageNum, - taskConfig.getPageSize() + periodTime.getPeriodStartDate(), + periodTime.getPeriodEndDate(), + pageNum, + taskConfig.getPageSize() ); if (Func.isEmpty(users)) { break; } - userService.batchSavePowerUser(users); + userService.batchSaveOrUpdatePowerUser(users); } } /** - * 需要去适配获取部门信息 + * 需要去适配获取用户信息 * * @param startDate * @param endDate diff --git a/common-collect/src/main/java/com/docus/server/collect/job/user/UserHttpCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/job/user/UserHttpCollectJob.java index 99b1ba3..75aa45b 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/user/UserHttpCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/job/user/UserHttpCollectJob.java @@ -2,7 +2,7 @@ package com.docus.server.collect.job.user; import com.docus.server.collect.service.IHttpUserCollectService; import com.docus.server.collect.service.ITaskConfigService; -import com.docus.server.sys.pojo.dto.UserDTO; +import com.docus.server.sys.common.pojo.dto.UserDTO; import com.docus.server.sys.service.IPowerUserService; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -26,7 +26,7 @@ public class UserHttpCollectJob extends AbstractUserCollectJob { /** * xxl jobhandler 手工执行 */ - @XxlJob("startAllDeptHttpCollect") + @XxlJob("startAllUserHttpCollect") public void startAllDeptHttpCollect() { super.startCollectAll(getJobParam()); } @@ -34,7 +34,7 @@ public class UserHttpCollectJob extends AbstractUserCollectJob { /** * xxl jobhandler 配置定时启动，如果未完成任务跳过。 */ - @XxlJob("startIncDeptHttpCollect") + @XxlJob("startIncUserHttpCollect") public void startIncDeptHttpCollect() { super.startCollectIncrement(getJobParam()); } diff --git a/common-collect/src/main/java/com/docus/server/collect/job/user/UserViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/job/user/UserViewCollectJob.java index 0234c59..f5933a7 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/user/UserViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/job/user/UserViewCollectJob.java @@ -2,7 +2,7 @@ package com.docus.server.collect.job.user; import com.docus.server.collect.service.ITaskConfigService; import com.docus.server.his.service.IHisService; -import com.docus.server.sys.pojo.dto.UserDTO; +import com.docus.server.sys.common.pojo.dto.UserDTO; import com.docus.server.sys.service.IPowerUserService; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; diff --git a/common-collect/src/main/java/com/docus/server/collect/mq/IMqCollectService.java b/common-collect/src/main/java/com/docus/server/collect/mq/IMqCollectService.java new file mode 100644 index 0000000..def4c4a --- /dev/null +++ b/common-collect/src/main/java/com/docus/server/collect/mq/IMqCollectService.java @@ -0,0 +1,6 @@ +package com.docus.server.collect.mq; + +public interface IMqCollectService { + + +} diff --git a/common-collect/src/main/java/com/docus/server/collect/mq/MqCollect.java b/common-collect/src/main/java/com/docus/server/collect/mq/MqCollect.java deleted file mode 100644 index e63cb12..0000000 --- a/common-collect/src/main/java/com/docus/server/collect/mq/MqCollect.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.docus.server.collect.mq; - -import com.docus.server.sys.service.Dept; -import com.docus.server.sys.service.IPowerDeptService; -import com.docus.server.ws.IWsResult; -import lombok.extern.slf4j.Slf4j; - -import javax.annotation.Resource; - -/** - * 每家mq 都不一样，这部分无法预先写好写入，需要根据每家独立编写。 - */ -@Slf4j -public class MqCollect { - - @Resource - private IPowerDeptService deptService; - @Resource - private IWsResult wsResult; - - public String receiveDept(String deptXml) { - log.info("收到科室消息：{}", deptXml); - try { - Dept dept = this.parseDeptXml(deptXml); - deptService.save(dept); - return wsResult.ok(dept.getParams()); - } catch (Exception e) { - return wsResult.fail(e.getMessage()); - } - } - - public Dept parseDeptXml(String deptXml) { - return null; - } -} diff --git a/common-collect/src/main/java/com/docus/server/collect/mq/dept/AbstractDeptMqCollectService.java b/common-collect/src/main/java/com/docus/server/collect/mq/dept/AbstractDeptMqCollectService.java new file mode 100644 index 0000000..18f810c --- /dev/null +++ b/common-collect/src/main/java/com/docus/server/collect/mq/dept/AbstractDeptMqCollectService.java @@ -0,0 +1,48 @@ +package com.docus.server.collect.mq.dept; + +import com.docus.server.sys.common.pojo.dto.DeptDTO; +import com.docus.server.sys.service.IPowerDeptService; +import lombok.extern.slf4j.Slf4j; + +import javax.annotation.Resource; + +/** + * 每家mq 都不一样，这部分无法预先写好写入，需要根据每家独立编写。 + */ +@Slf4j +public abstract class AbstractDeptMqCollectService implements IMqDeptCollectService { + + @Resource + private IPowerDeptService deptService; + + /** + * 订阅队列（注册科室） + * + * @param message 科室信息 + */ + @Override + public void addDept(String message) { + log.info("注册科室 队列接收信息：{}", message); + DeptDTO dept = this.parseAddDeptXml(message); + deptService.saveOrUpdatePowerDept(dept); + } + + + /** + * 订阅队列（变更科室） + * + * @param message 科室信息 + */ + @Override + public void updateDept(String message) { + log.info("变更科室 队列接收信息：{}", message); + DeptDTO deptDto = this.parseUpdateDeptXml(message); + deptService.saveOrUpdatePowerDept(deptDto); + } + + protected abstract DeptDTO parseAddDeptXml(String message); + + protected abstract DeptDTO parseUpdateDeptXml(String message); + + +} diff --git a/common-collect/src/main/java/com/docus/server/collect/mq/dept/IMqDeptCollectService.java b/common-collect/src/main/java/com/docus/server/collect/mq/dept/IMqDeptCollectService.java new file mode 100644 index 0000000..1109120 --- /dev/null +++ b/common-collect/src/main/java/com/docus/server/collect/mq/dept/IMqDeptCollectService.java @@ -0,0 +1,21 @@ +package com.docus.server.collect.mq.dept; + +import com.docus.server.collect.mq.IMqCollectService; + +public interface IMqDeptCollectService extends IMqCollectService { + + /** + * 订阅队列（注册科室） + * + * @param message 科室信息 + */ + void addDept(String message); + + /** + * 订阅队列（变更科室） + * + * @param message 科室信息 + */ + void updateDept(String message); + +} diff --git a/common-collect/src/main/java/com/docus/server/collect/mq/user/AbstractUserMqCollectService.java b/common-collect/src/main/java/com/docus/server/collect/mq/user/AbstractUserMqCollectService.java new file mode 100644 index 0000000..aca935a --- /dev/null +++ b/common-collect/src/main/java/com/docus/server/collect/mq/user/AbstractUserMqCollectService.java @@ -0,0 +1,47 @@ +package com.docus.server.collect.mq.user; + +import com.docus.server.sys.common.pojo.dto.UserDTO; +import com.docus.server.sys.service.IPowerUserService; +import lombok.extern.slf4j.Slf4j; + +import javax.annotation.Resource; + +/** + * 每家mq 都不一样，这部分无法预先写好写入，需要根据每家独立编写。 + */ +@Slf4j +public abstract class AbstractUserMqCollectService implements IMqUserCollectService { + + @Resource + private IPowerUserService userService; + + /** + * 订阅队列（注册人员） + * + * @param message 人员信息 + */ + @Override + public void addUser(String message) { + log.info("人员注册 队列接收信息：{}", message); + UserDTO userDto = this.parseAddUserXml(message); + userService.saveOrUpdatePowerUser(userDto); + } + + /** + * 订阅队列（变更人员） + * + * @param message 人员信息 + */ + @Override + public void updateUser(String message) { + log.info("人员变更 队列接收信息：{}", message); + UserDTO userDto = this.parseUpdateUserXml(message); + userService.saveOrUpdatePowerUser(userDto); + } + + protected abstract UserDTO parseAddUserXml(String message); + + protected abstract UserDTO parseUpdateUserXml(String message); + + +} diff --git a/common-collect/src/main/java/com/docus/server/collect/mq/user/IMqUserCollectService.java b/common-collect/src/main/java/com/docus/server/collect/mq/user/IMqUserCollectService.java new file mode 100644 index 0000000..59baebb --- /dev/null +++ b/common-collect/src/main/java/com/docus/server/collect/mq/user/IMqUserCollectService.java @@ -0,0 +1,24 @@ +package com.docus.server.collect.mq.user; + +import com.docus.server.collect.mq.IMqCollectService; + +public interface IMqUserCollectService extends IMqCollectService { + + + /** + * 订阅队列（注册人员） + * + * @param message 人员信息 + */ + void addUser(String message); + + + /** + * 订阅队列（变更人员） + * + * @param message 人员信息 + */ + void updateUser(String message); + + +} diff --git a/common-collect/src/main/java/com/docus/server/collect/service/CollectService.java b/common-collect/src/main/java/com/docus/server/collect/service/CollectService.java index db1c4c2..1d2789a 100644 --- a/common-collect/src/main/java/com/docus/server/collect/service/CollectService.java +++ b/common-collect/src/main/java/com/docus/server/collect/service/CollectService.java @@ -2,7 +2,7 @@ package com.docus.server.collect.service; import com.docus.server.collect.infrastructure.dao.ReceiveDeptInfoEntity; import com.docus.server.collect.infrastructure.mapper.ReceiveDeptInfoMapper; -import com.docus.server.sys.service.Dept; +import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.service.IPowerDeptService; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; @@ -18,7 +18,7 @@ public class CollectService { @Resource private ReceiveDeptInfoMapper receiveDeptInfoMapper; - public void receiveDept(Dept dept) { + public void receiveDept(DeptDTO dept) { //判断任务是否存在。 //保存数据库 @@ -27,7 +27,7 @@ public class CollectService { receiveDeptInfoMapper.insert(receiveDeptInfoEntity); //异步写入归档系统，失败自动重试。 - deptService.save(dept); + deptService.saveOrUpdatePowerDept(dept); } diff --git a/common-collect/src/main/java/com/docus/server/collect/service/IHttpBasicCollectService.java b/common-collect/src/main/java/com/docus/server/collect/service/IHttpBasicCollectService.java deleted file mode 100644 index 48d1213..0000000 --- a/common-collect/src/main/java/com/docus/server/collect/service/IHttpBasicCollectService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.docus.server.collect.service; - -import com.docus.server.sys.pojo.dto.TBasicDTO; - -import java.util.Date; -import java.util.List; - -public interface IHttpBasicCollectService { - List getBasics(Date startDate, Date endDate, long pageNum, long pageSize); -} diff --git a/common-collect/src/main/java/com/docus/server/collect/service/IHttpDeptCollectService.java b/common-collect/src/main/java/com/docus/server/collect/service/IHttpDeptCollectService.java new file mode 100644 index 0000000..2a56485 --- /dev/null +++ b/common-collect/src/main/java/com/docus/server/collect/service/IHttpDeptCollectService.java @@ -0,0 +1,10 @@ +package com.docus.server.collect.service; + +import com.docus.server.sys.common.pojo.dto.DeptDTO; + +import java.util.Date; +import java.util.List; + +public interface IHttpDeptCollectService { + List getDepts(Date startDate, Date endDate, long pageNum, long pageSize); +} diff --git a/common-collect/src/main/java/com/docus/server/collect/service/IHttpTBasicCollectService.java b/common-collect/src/main/java/com/docus/server/collect/service/IHttpTBasicCollectService.java index 5031dfe..6c861c5 100644 --- a/common-collect/src/main/java/com/docus/server/collect/service/IHttpTBasicCollectService.java +++ b/common-collect/src/main/java/com/docus/server/collect/service/IHttpTBasicCollectService.java @@ -1,10 +1,10 @@ package com.docus.server.collect.service; -import com.docus.server.sys.pojo.dto.TBasicDTO; +import com.docus.server.record.pojo.dto.TBasicDTO; import java.util.Date; import java.util.List; public interface IHttpTBasicCollectService { - List getDepts(Date startDate, Date endDate, long pageNum, long pageSize); + List getTBasics(Date startDate, Date endDate, long pageNum, long pageSize); } diff --git a/common-collect/src/main/java/com/docus/server/collect/service/IHttpUserCollectService.java b/common-collect/src/main/java/com/docus/server/collect/service/IHttpUserCollectService.java index 2a003f6..d4e058e 100644 --- a/common-collect/src/main/java/com/docus/server/collect/service/IHttpUserCollectService.java +++ b/common-collect/src/main/java/com/docus/server/collect/service/IHttpUserCollectService.java @@ -1,6 +1,6 @@ package com.docus.server.collect.service; -import com.docus.server.sys.pojo.dto.UserDTO; +import com.docus.server.sys.common.pojo.dto.UserDTO; import java.util.Date; import java.util.List; diff --git a/common-collect/src/main/java/com/docus/server/collect/service/IParseService.java b/common-collect/src/main/java/com/docus/server/collect/service/IParseService.java index 565156a..848ca1e 100644 --- a/common-collect/src/main/java/com/docus/server/collect/service/IParseService.java +++ b/common-collect/src/main/java/com/docus/server/collect/service/IParseService.java @@ -1,10 +1,10 @@ package com.docus.server.collect.service; import com.docus.server.record.pojo.entity.MedicalRecord; -import com.docus.server.sys.service.Dept; +import com.docus.server.sys.common.pojo.dto.DeptDTO; public interface IParseService { MedicalRecord parseHandNumbness(String handNumbness); - Dept parseDeptXml(String deptXml); + DeptDTO parseDeptXml(String deptXml); } diff --git a/common-collect/src/main/java/com/docus/server/ws/IWebserviceServer.java b/common-collect/src/main/java/com/docus/server/ws/IWebserviceServer.java index d4a76ee..7fd43a3 100644 --- a/common-collect/src/main/java/com/docus/server/ws/IWebserviceServer.java +++ b/common-collect/src/main/java/com/docus/server/ws/IWebserviceServer.java @@ -6,15 +6,73 @@ import javax.jws.WebService; public interface IWebserviceServer { /** - * 接收xml。并且下载病案。 + * 接收xml。并且下载病案。 */ String receiveHandNumbness(String handNumbness); /** * 接收部门xml + * * @param deptXml * @return */ String receiveDept(String deptXml); + + + /** + * 科室信息接收，进行操作 + * + * @param receiveUser 接收到的科室数据 + * @return 返回结果 + */ + String deptModify(String receiveUser); + + String setTBasic(String str); + + String updateTBasic(String str); + + /** + * 用户信息接收，进行操作 + * + * @param receiveUser 接收到的用户参数 + * @return 返回结果 + */ + String userModify(String receiveUser); + + + /** + * 接收重症报告信息 + * + * @param icuReportMessage 重症报告信息 + * @return 返回信息 + */ + String pushICUReport(String icuReportMessage); + + /** + * 接收检查报告的信息 - 新增 + * + * @param inspectionReportMessage 检查报告信息 - 新增 + * @return 成功或者异常信息 + */ + String pushAddInspectionReport(String inspectionReportMessage); + + /** + * 接收检查报告的信息 - 更新 + * + * @param inspectionReportMessage 检查报告信息 -更新 + * @return 成功或者异常信息 + */ + String pushUpdateInspectionReport(String inspectionReportMessage); + + + /** + * 接收检查报告的信息 - 更新 + * + * @param xml 检查报告信息 -更新 + * @return 成功或者异常信息 + */ + String querySdJxIndexTest(String xml); + + String querySdJxIndexNoResultTest(String xml); } diff --git a/common-collect/src/main/java/com/docus/server/ws/IWsResult.java b/common-collect/src/main/java/com/docus/server/ws/IWsResult.java index 7ffabd9..ba6314c 100644 --- a/common-collect/src/main/java/com/docus/server/ws/IWsResult.java +++ b/common-collect/src/main/java/com/docus/server/ws/IWsResult.java @@ -4,7 +4,7 @@ import java.util.Map; public interface IWsResult { - String ok(Map params); + String ok(Map params); String fail(String message); diff --git a/common-collect/src/main/java/com/docus/server/ws/WsCollect.java b/common-collect/src/main/java/com/docus/server/ws/WsCollect.java index 51916e3..bf899eb 100644 --- a/common-collect/src/main/java/com/docus/server/ws/WsCollect.java +++ b/common-collect/src/main/java/com/docus/server/ws/WsCollect.java @@ -4,7 +4,7 @@ import com.docus.server.collect.service.CollectService; import com.docus.server.collect.service.IParseService; import com.docus.server.record.pojo.entity.MedicalRecord; import com.docus.server.record.service.IMedicalRecordService; -import com.docus.server.sys.service.Dept; +import com.docus.server.sys.common.pojo.dto.DeptDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -34,17 +34,16 @@ public class WsCollect { } } - public String receiveDept(String deptXml) { log.info("收到科室消息：{}", deptXml); try { - Dept dept = parseService.parseDeptXml(deptXml); + DeptDTO dept = parseService.parseDeptXml(deptXml); //此处需要存储原xml内容。 collectService.receiveDept(dept); return wsResult.ok(dept.getParams()); } catch (Exception e) { - return wsResult.fail(e.getMessage()); + return wsResult.fail(e.getMessage(), dept.getParams()); } } diff --git a/common-collect/src/main/java/com/docus/server/ws/impl/WebserviceServer.java b/common-collect/src/main/java/com/docus/server/ws/impl/WebserviceServer.java index 5fe3cc6..cc515f4 100644 --- a/common-collect/src/main/java/com/docus/server/ws/impl/WebserviceServer.java +++ b/common-collect/src/main/java/com/docus/server/ws/impl/WebserviceServer.java @@ -24,4 +24,49 @@ public class WebserviceServer implements IWebserviceServer { return wsCollect.receiveDept(deptXml); } + @Override + public String deptModify(String receiveUser) { + return null; + } + + @Override + public String setTBasic(String str) { + return null; + } + + @Override + public String updateTBasic(String str) { + return null; + } + + @Override + public String userModify(String receiveUser) { + return null; + } + + @Override + public String pushICUReport(String icuReportMessage) { + return null; + } + + @Override + public String pushAddInspectionReport(String inspectionReportMessage) { + return null; + } + + @Override + public String pushUpdateInspectionReport(String inspectionReportMessage) { + return null; + } + + @Override + public String querySdJxIndexTest(String xml) { + return null; + } + + @Override + public String querySdJxIndexNoResultTest(String xml) { + return null; + } + } diff --git a/docus-medical-record/src/main/java/com/docus/server/record/mapper/TBasicMapper.java b/docus-medical-record/src/main/java/com/docus/server/record/mapper/TBasicMapper.java index ea832c3..aa1bc9e 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/mapper/TBasicMapper.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/mapper/TBasicMapper.java @@ -25,7 +25,8 @@ public interface TBasicMapper extends BaseMapper { * @param admissTimes 住院次数 * @return 病案主键 */ - String getPatientIdByInpatientNoAndAdminssTimes(@Param("inpatientNo") String inpatientNo, @Param("adminssTimes") Integer admissTimes); + String getPatientIdByInpatientNoAndAdminssTimes(@Param("inpatientNo") String inpatientNo, + @Param("adminssTimes") Integer admissTimes); Integer selectOne(@Param("jzh") String jzh); @@ -35,11 +36,14 @@ public interface TBasicMapper extends BaseMapper { Integer insertExtend(@Param("tBasicExtend") TBasicExtend tBasicExtend); - Integer update(@Param("tBasic") TBasic tBasic); + Integer updateTBasic(@Param("tBasic") TBasic tBasic); Integer updateExtend(@Param("tBasicExtend") TBasicExtend tBasicExtend); - List selectBasicListByAdmissDate(@Param("admissStartDate") String admissStartDate, @Param("admissEndDate") String admissEndDate, @Param("offset") int offset, @Param("size") int size); + List selectBasicListByAdmissDate(@Param("admissStartDate") String admissStartDate, + @Param("admissEndDate") String admissEndDate, + @Param("offset") int offset, + @Param("size") int size); /** * 查询归档关联顺德人医报告的交叉索引 @@ -49,7 +53,10 @@ public interface TBasicMapper extends BaseMapper { */ String getSdRyIndexByPatientId(@Param("patientId") String patientId); - List selectBasicListByCreateOrUpdateTime(@Param("startDate") String queryBasicStartDate, @Param("endDate") String queryBasicEndDate, @Param("offset") int offset, @Param("size") int size); + List selectBasicListByCreateOrUpdateTime(@Param("startDate") String queryBasicStartDate, + @Param("endDate") String queryBasicEndDate, + @Param("offset") int offset, + @Param("size") int size); List selectBasicListByPatientIds(@Param("patientIds") List patientIds); } diff --git a/docus-medical-record/src/main/java/com/docus/server/record/pojo/dto/TBasicDTO.java b/docus-medical-record/src/main/java/com/docus/server/record/pojo/dto/TBasicDTO.java index 27e3d64..1bce16d 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/pojo/dto/TBasicDTO.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/pojo/dto/TBasicDTO.java @@ -18,12 +18,15 @@ public class TBasicDTO { private String jzh; private String inpatientNo; private String admissTimes; - private String name ; - private String admissDate ; - private String disDate ; - private String admissDeptName ; - private String disDeptName ; + private String name; + private String admissDate; + private String disDate; + private String admissDeptName; + private String disDeptName; + private String attending; private String attendingName; + private String dutyNurse; + private String admissDept; private String age; private String sex; private String idCard; diff --git a/docus-medical-record/src/main/java/com/docus/server/record/pojo/entity/MedicalRecord.java b/docus-medical-record/src/main/java/com/docus/server/record/pojo/entity/MedicalRecord.java index 3c6507f..993cefe 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/pojo/entity/MedicalRecord.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/pojo/entity/MedicalRecord.java @@ -68,13 +68,13 @@ public class MedicalRecord { /** * 拓展参数 */ - private Map params; + private Map params; public MedicalRecord(InpatientNo inpatientNo, String jzh, Integer admisstimes, String sysFlag, String downUrl, String fileTitle, String serialnum, String assortId, String fileSource, - String patientId, String sourceInfo, IdType idType, Map params) { + String patientId, String sourceInfo, IdType idType, Map params) { this.inpatientNo = inpatientNo; this.jzh = jzh; this.admisstimes = admisstimes; diff --git a/docus-medical-record/src/main/java/com/docus/server/record/pojo/entity/TBasic.java b/docus-medical-record/src/main/java/com/docus/server/record/pojo/entity/TBasic.java index 33fdf3d..5ae803d 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/pojo/entity/TBasic.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/pojo/entity/TBasic.java @@ -153,4 +153,7 @@ public class TBasic implements Serializable { @ApiModelProperty(value = "床位号") private String bedNum; + + @ApiModelProperty(value = "责任护士") + private String dutyNurse; } diff --git a/docus-medical-record/src/main/java/com/docus/server/record/service/ITBasicService.java b/docus-medical-record/src/main/java/com/docus/server/record/service/ITBasicService.java index 8673d86..095a76f 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/service/ITBasicService.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/service/ITBasicService.java @@ -2,10 +2,30 @@ package com.docus.server.record.service; import com.docus.server.record.pojo.dto.TBasicDTO; +import java.util.List; + public interface ITBasicService { - public void setTBasic(TBasicDTO dto) throws Exception; + /** + * 新增 + * + * @param dto + * @throws Exception + */ + void addTBasic(TBasicDTO dto) throws Exception; - public void updateTBasic(TBasicDTO dto) throws Exception; + /** + * 更新 + * + * @param dto + * @throws Exception + */ + void updateTBasic(TBasicDTO dto) throws Exception; + /** + * 批量新增 + * + * @param basicDTOList + */ + void batchSaveBasics(List basicDTOList); } diff --git a/docus-medical-record/src/main/java/com/docus/server/record/service/impl/MedicalRecordService.java b/docus-medical-record/src/main/java/com/docus/server/record/service/impl/MedicalRecordServiceImpl.java similarity index 90% rename from docus-medical-record/src/main/java/com/docus/server/record/service/impl/MedicalRecordService.java rename to docus-medical-record/src/main/java/com/docus/server/record/service/impl/MedicalRecordServiceImpl.java index 0185caf..c5e0600 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/service/impl/MedicalRecordService.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/service/impl/MedicalRecordServiceImpl.java @@ -3,10 +3,10 @@ package com.docus.server.record.service.impl; import com.docus.server.record.pojo.dto.IdType; import com.docus.server.record.pojo.entity.MedicalRecord; import com.docus.server.record.service.IMedicalRecordService; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; -@Component -public class MedicalRecordService implements IMedicalRecordService { +@Service +public class MedicalRecordServiceImpl implements IMedicalRecordService { @Override public void receive(MedicalRecord medicalRecord) { diff --git a/docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java b/docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java index 0c0baba..5ab004e 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java @@ -15,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Date; +import java.util.List; @Service public class TBasicServiceImpl extends ServiceImpl implements ITBasicService { @@ -27,7 +28,7 @@ public class TBasicServiceImpl extends ServiceImpl impleme @Override @Transactional(rollbackFor = Exception.class) - public void setTBasic(TBasicDTO tBasicDTO) throws Exception { + public void addTBasic(TBasicDTO tBasicDTO) { //判断jzh是否重复 Integer num = tBasicMapper.selectOne(tBasicDTO.getJzh()); if (num > 0) { @@ -85,6 +86,10 @@ public class TBasicServiceImpl extends ServiceImpl impleme tBasic.setAdmissDeptName(tBasicDTO.getAdmissDeptName()); tBasic.setDisDeptName(tBasicDTO.getDisDeptName()); tBasic.setAttendingName(tBasicDTO.getAttendingName()); + tBasic.setAttending(tBasicDTO.getAttending()); + tBasic.setDutyNurse(tBasicDTO.getDutyNurse()); + tBasic.setAdmissDept(tBasicDTO.getAdmissDept()); + tBasic.setCreateTime(DateUtil.now()); tBasic.setAge(age); tBasic.setSex(tBasicDTO.getSex()); tBasic.setIdCard(tBasicDTO.getIdCard()); @@ -101,19 +106,20 @@ public class TBasicServiceImpl extends ServiceImpl impleme tBasicExtend.setSdryIndex(tBasicDTO.getSdryIndex()); //持久化 - tBasicMapper.insert(tBasic); + tBasicMapper.insertTBasic(tBasic); tBasicMapper.insertExtend(tBasicExtend); } @Override @Transactional(rollbackFor = Exception.class) - public void updateTBasic(TBasicDTO tBasicDTO) throws Exception { + public void updateTBasic(TBasicDTO tBasicDTO) { //判断jzh是否存在 String patientId = tBasicMapper.getPatientId(tBasicDTO.getJzh()); if (Func.isEmpty(patientId)) { - setTBasic(tBasicDTO); + addTBasic(tBasicDTO); return; } + //数据类型转化，格式处理 Date admissDate = null; if (Func.isNotEmpty(tBasicDTO.getAdmissDate())) { @@ -172,6 +178,10 @@ public class TBasicServiceImpl extends ServiceImpl impleme tBasic.setBedNum(tBasicDTO.getBedNum()); tBasic.setAdmissDays(admissDays); tBasic.setIsDead(isDead); + tBasic.setAttending(tBasicDTO.getAttending()); + tBasic.setDutyNurse(tBasicDTO.getDutyNurse()); + tBasic.setAdmissDept(tBasicDTO.getAdmissDept()); + tBasic.setCreateTime(DateUtil.now()); TBasicExtend tBasicExtend = new TBasicExtend(); tBasicExtend.setPatientId(patientId); @@ -180,9 +190,19 @@ public class TBasicServiceImpl extends ServiceImpl impleme tBasicExtend.setSdryIndex(tBasicDTO.getSdryIndex()); //持久化 - tBasicMapper.update(tBasic); + tBasicMapper.updateTBasic(tBasic); tBasicMapper.updateExtend(tBasicExtend); } + + private void convert() { + + } + + @Transactional(rollbackFor = Exception.class) + @Override + public void batchSaveBasics(List basicDTOList) { + basicDTOList.forEach(this::updateTBasic); + } } diff --git a/docus-medical-record/src/main/resources/mapper/TBasicMapper.xml b/docus-medical-record/src/main/resources/mapper/TBasicMapper.xml index 665c2bd..2855787 100644 --- a/docus-medical-record/src/main/resources/mapper/TBasicMapper.xml +++ b/docus-medical-record/src/main/resources/mapper/TBasicMapper.xml @@ -28,7 +28,7 @@ (#{tBasicExtend.patientId},#{tBasicExtend.wardCode},#{tBasicExtend.wardName},#{tBasicExtend.sdryIndex}) - + UPDATE `docus_medicalrecord`.`t_basic` diff --git a/docus-sys/src/main/java/com/docus/server/sys/pojo/dto/DeptDTO.java b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/DeptDTO.java similarity index 71% rename from docus-sys/src/main/java/com/docus/server/sys/pojo/dto/DeptDTO.java rename to docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/DeptDTO.java index 69cb6fc..6eccefe 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/pojo/dto/DeptDTO.java +++ b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/DeptDTO.java @@ -1,7 +1,10 @@ -package com.docus.server.sys.pojo.dto; +package com.docus.server.sys.common.pojo.dto; import lombok.Data; +import java.util.HashMap; +import java.util.Map; + /** * @author Fang Ruichuan * @date 2022-11-14 19:02 @@ -58,4 +61,20 @@ public class DeptDTO { deptModifyParam.setAuthorId(this.authorId); return deptModifyParam; } + + /** + * 拓展参数 + */ + private Map params; + + public Object getParams(String key) { + return params != null ? params.get(key) : null; + } + + public void setParams(String key, Object value) { + if (this.params == null) { + this.params = new HashMap<>(); + } + this.params.put(key, value); + } } diff --git a/docus-sys/src/main/java/com/docus/server/sys/pojo/dto/DeptModifyParam.java b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/DeptModifyParam.java similarity index 90% rename from docus-sys/src/main/java/com/docus/server/sys/pojo/dto/DeptModifyParam.java rename to docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/DeptModifyParam.java index e051700..11598e6 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/pojo/dto/DeptModifyParam.java +++ b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/DeptModifyParam.java @@ -1,4 +1,4 @@ -package com.docus.server.sys.pojo.dto; +package com.docus.server.sys.common.pojo.dto; import lombok.Data; diff --git a/docus-sys/src/main/java/com/docus/server/sys/pojo/dto/UserDTO.java b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/UserDTO.java similarity index 97% rename from docus-sys/src/main/java/com/docus/server/sys/pojo/dto/UserDTO.java rename to docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/UserDTO.java index 0393664..7c78f2f 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/pojo/dto/UserDTO.java +++ b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/UserDTO.java @@ -1,4 +1,4 @@ -package com.docus.server.sys.pojo.dto; +package com.docus.server.sys.common.pojo.dto; import lombok.Data; diff --git a/docus-sys/src/main/java/com/docus/server/sys/pojo/dto/UserModifyParam.java b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/UserModifyParam.java similarity index 94% rename from docus-sys/src/main/java/com/docus/server/sys/pojo/dto/UserModifyParam.java rename to docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/UserModifyParam.java index 2496251..09b943d 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/pojo/dto/UserModifyParam.java +++ b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/UserModifyParam.java @@ -1,4 +1,4 @@ -package com.docus.server.sys.pojo.dto; +package com.docus.server.sys.common.pojo.dto; import lombok.Data; diff --git a/docus-sys/src/main/java/com/docus/server/sys/pojo/entity/PowerDept.java b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/entity/PowerDept.java similarity index 96% rename from docus-sys/src/main/java/com/docus/server/sys/pojo/entity/PowerDept.java rename to docus-sys/src/main/java/com/docus/server/sys/common/pojo/entity/PowerDept.java index 8bd7fa7..6f56047 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/pojo/entity/PowerDept.java +++ b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/entity/PowerDept.java @@ -1,4 +1,4 @@ -package com.docus.server.sys.pojo.entity; +package com.docus.server.sys.common.pojo.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/docus-sys/src/main/java/com/docus/server/sys/pojo/entity/PowerUser.java b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/entity/PowerUser.java similarity index 97% rename from docus-sys/src/main/java/com/docus/server/sys/pojo/entity/PowerUser.java rename to docus-sys/src/main/java/com/docus/server/sys/common/pojo/entity/PowerUser.java index 51845b7..d6fcb47 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/pojo/entity/PowerUser.java +++ b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/entity/PowerUser.java @@ -1,4 +1,4 @@ -package com.docus.server.sys.pojo.entity; +package com.docus.server.sys.common.pojo.entity; import io.swagger.annotations.ApiModel; diff --git a/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/DeptDao.java b/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/DeptDao.java deleted file mode 100644 index 7b64136..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/DeptDao.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.docus.server.sys.infrastructure.dao; - -import com.docus.server.sys.service.Dept; -import org.springframework.stereotype.Component; - -@Component -public class DeptDao implements IDeptDao { - - @Override - public void save(Dept dept) { - - } - - @Override - public Dept getDept(String code) { - return null; - } -} diff --git a/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/IDeptDao.java b/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/IDeptDao.java deleted file mode 100644 index b4322ae..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/IDeptDao.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.docus.server.sys.infrastructure.dao; - -import com.docus.server.sys.service.Dept; - -public interface IDeptDao { - - public void save(Dept dept); - - - public Dept getDept(String code); - - -} diff --git a/docus-sys/src/main/java/com/docus/server/sys/mapper/PowerDeptMapper.java b/docus-sys/src/main/java/com/docus/server/sys/mapper/PowerDeptMapper.java index cf903fd..8445a0b 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/mapper/PowerDeptMapper.java +++ b/docus-sys/src/main/java/com/docus/server/sys/mapper/PowerDeptMapper.java @@ -1,8 +1,8 @@ package com.docus.server.sys.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.docus.server.sys.pojo.dto.DeptModifyParam; -import com.docus.server.sys.pojo.entity.PowerDept; +import com.docus.server.sys.common.pojo.dto.DeptModifyParam; +import com.docus.server.sys.common.pojo.entity.PowerDept; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/docus-sys/src/main/java/com/docus/server/sys/mapper/PowerUserMapper.java b/docus-sys/src/main/java/com/docus/server/sys/mapper/PowerUserMapper.java index f74fd35..333098d 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/mapper/PowerUserMapper.java +++ b/docus-sys/src/main/java/com/docus/server/sys/mapper/PowerUserMapper.java @@ -1,8 +1,8 @@ package com.docus.server.sys.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.docus.server.sys.pojo.dto.UserModifyParam; -import com.docus.server.sys.pojo.entity.PowerUser; +import com.docus.server.sys.common.pojo.dto.UserModifyParam; +import com.docus.server.sys.common.pojo.entity.PowerUser; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/docus-sys/src/main/java/com/docus/server/sys/pojo/dto/TBasicDTO.java b/docus-sys/src/main/java/com/docus/server/sys/pojo/dto/TBasicDTO.java deleted file mode 100644 index ede4043..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/pojo/dto/TBasicDTO.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.docus.server.sys.pojo.dto; - -import lombok.Data; - -/** - * @BelongsProject: docus-webservice-sdry - * @BelongsPackage: com.docus.server.collection.webservice - * @Author: chierhao - * @CreateTime: 2023-02-25 14:44 - * @Description: TODO - * @Version: 1.0 - */ -@Data -public class TBasicDTO { - private String serialId; - private String receive; - private String send; - private String jzh; - private String inpatientNo; - private String admissTimes; - private String name ; - private String admissDate ; - private String disDate ; - private String admissDeptName ; - private String disDeptName ; - private String attendingName; - private String age; - private String sex; - private String idCard; - private String disDept; - private String sexName; - private String bedNum; - private String isDead; - private String admissDays; - private String wardCode; - private String wardName; - private String sdryIndex; -} diff --git a/docus-sys/src/main/java/com/docus/server/sys/service/Dept.java b/docus-sys/src/main/java/com/docus/server/sys/service/Dept.java deleted file mode 100644 index a384b34..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/service/Dept.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.docus.server.sys.service; - -import lombok.Data; - -import java.util.Date; -import java.util.Map; - -@Data -public class Dept { - - private String deptCode; - - private String deptName; - - private Date dataUpdateTime; - - private String source; - - /** - * 拓展参数 - */ - private Map params; - -} diff --git a/docus-sys/src/main/java/com/docus/server/sys/service/IPowerDeptService.java b/docus-sys/src/main/java/com/docus/server/sys/service/IPowerDeptService.java index f591a2a..f22f9f1 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/service/IPowerDeptService.java +++ b/docus-sys/src/main/java/com/docus/server/sys/service/IPowerDeptService.java @@ -1,6 +1,6 @@ package com.docus.server.sys.service; -import com.docus.server.sys.pojo.dto.DeptDTO; +import com.docus.server.sys.common.pojo.dto.DeptDTO; import java.util.List; @@ -12,7 +12,7 @@ public interface IPowerDeptService { * @param deptDto 用户注册参数 * @return 处理结果 */ - boolean register(DeptDTO deptDto); + boolean saveOrUpdatePowerDept(DeptDTO deptDto); /** * 根据科室编号删除科室 @@ -22,5 +22,10 @@ public interface IPowerDeptService { */ boolean delDeptByDeptCode(String deptCode); - void batchSavePowerDept(List deptDTOList); + /** + * 批量新增或修改 + * + * @param deptDTOList + */ + void batchSaveOrUpdatePowerDept(List deptDTOList); } diff --git a/docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java b/docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java index 4da1e1f..bf6c5b9 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java +++ b/docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java @@ -1,6 +1,6 @@ package com.docus.server.sys.service; -import com.docus.server.sys.pojo.dto.UserDTO; +import com.docus.server.sys.common.pojo.dto.UserDTO; import java.util.List; @@ -14,7 +14,7 @@ public interface IPowerUserService { * @param userDTO 用户注册参数 * @return 处理结果 */ - boolean register(UserDTO userDTO); + boolean saveOrUpdatePowerUser(UserDTO userDTO); /** * 根据用户工号删除用户 @@ -29,5 +29,5 @@ public interface IPowerUserService { * * @param users */ - void batchSavePowerUser(List users); + void batchSaveOrUpdatePowerUser(List users); } diff --git a/docus-sys/src/main/java/com/docus/server/sys/service/ITBasicService.java b/docus-sys/src/main/java/com/docus/server/sys/service/ITBasicService.java deleted file mode 100644 index 0025483..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/service/ITBasicService.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.docus.server.sys.service; - -import com.docus.server.sys.pojo.dto.TBasicDTO; - -import java.util.List; - -/** - * 用户服务 - */ -public interface ITBasicService { - /** - * 科室注册 - * - * @param deptDTOList 用户注册参数 - * @return 处理结果 - */ - void batchSaveBasics(List deptDTOList); - - /** - * 科室注册 - * - * @param deptDTO 用户注册参数 - * @return 处理结果 - */ - boolean register(TBasicDTO deptDTO); - - /** - * 根据科室编号删除科室 - * - * @param deptCode 科室编码 - * @return 删除结果 - */ - boolean delDeptByDeptCode(String deptCode); -} diff --git a/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerDeptServiceImpl.java b/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerDeptServiceImpl.java index 993f9d2..b244c71 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerDeptServiceImpl.java +++ b/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerDeptServiceImpl.java @@ -3,10 +3,10 @@ package com.docus.server.sys.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.docus.core.util.Func; import com.docus.infrastructure.redis.service.IdService; +import com.docus.server.sys.common.pojo.dto.DeptDTO; +import com.docus.server.sys.common.pojo.dto.DeptModifyParam; +import com.docus.server.sys.common.pojo.entity.PowerDept; import com.docus.server.sys.mapper.PowerDeptMapper; -import com.docus.server.sys.pojo.dto.DeptDTO; -import com.docus.server.sys.pojo.dto.DeptModifyParam; -import com.docus.server.sys.pojo.entity.PowerDept; import com.docus.server.sys.service.IPowerDeptService; import org.springframework.stereotype.Service; @@ -24,12 +24,12 @@ public class PowerDeptServiceImpl extends ServiceImpl deptDTOList) { - deptDTOList.forEach(this::register); + public void batchSaveOrUpdatePowerDept(List deptDTOList) { + deptDTOList.forEach(this::saveOrUpdatePowerDept); } @Override - public boolean register(DeptDTO deptDTO) { + public boolean saveOrUpdatePowerDept(DeptDTO deptDTO) { PowerDept powerDept = baseMapper.getDeptByDeptCode(deptDTO.getDeptCode()); DeptModifyParam deptModifyParam = deptDTO.transDeptAddParam(); if (Func.isEmpty(powerDept)) { diff --git a/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java b/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java index ec8e8c9..476caec 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java +++ b/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java @@ -5,9 +5,9 @@ import com.docus.core.util.Func; import com.docus.infrastructure.redis.service.IdService; import com.docus.server.sys.common.UserProperties; import com.docus.server.sys.mapper.PowerUserMapper; -import com.docus.server.sys.pojo.dto.UserDTO; -import com.docus.server.sys.pojo.dto.UserModifyParam; -import com.docus.server.sys.pojo.entity.PowerUser; +import com.docus.server.sys.common.pojo.dto.UserDTO; +import com.docus.server.sys.common.pojo.dto.UserModifyParam; +import com.docus.server.sys.common.pojo.entity.PowerUser; import com.docus.server.sys.service.IPowerUserService; import org.springframework.stereotype.Service; @@ -27,12 +27,12 @@ public class PowerUserServiceImpl extends ServiceImpl userDTOList) { - userDTOList.forEach(this::register); + public void batchSaveOrUpdatePowerUser(List userDTOList) { + userDTOList.forEach(this::saveOrUpdatePowerUser); } @Override - public boolean register(UserDTO userDTO) { + public boolean saveOrUpdatePowerUser(UserDTO userDTO) { PowerUser powerUser = baseMapper.getUserByUserName(userDTO.getUserName()); UserModifyParam userModifyParam = userDTO.transUserAddParam(); if (Func.isEmpty(powerUser)) { diff --git a/docus-sys/src/main/java/com/docus/server/sys/service/impl/TBasicServiceImpl.java b/docus-sys/src/main/java/com/docus/server/sys/service/impl/TBasicServiceImpl.java deleted file mode 100644 index 9a52479..0000000 --- a/docus-sys/src/main/java/com/docus/server/sys/service/impl/TBasicServiceImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.docus.server.sys.service.impl; - -import com.docus.core.util.Func; -import com.docus.infrastructure.redis.service.IdService; -import com.docus.server.sys.common.UserProperties; -import com.docus.server.sys.pojo.dto.UserDTO; -import com.docus.server.sys.pojo.dto.UserModifyParam; -import com.docus.server.sys.pojo.entity.PowerUser; -import com.docus.server.sys.service.ITBasicService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 用户服务实现 - * - * @author wyb - */ -@Service -public class TBasicServiceImpl extends ServiceImpl implements ITBasicService { - @Resource - private IdService idService; - @Resource - private UserProperties userProperties; - - @Override - public void batchSavePowerUser(List userDTOList) { - userDTOList.forEach(this::register); - } - - @Override - public boolean register(UserDTO userDTO) { - PowerUser powerUser = baseMapper.getUserByUserName(userDTO.getUserName()); - UserModifyParam userModifyParam = userDTO.transUserAddParam(); - if (Func.isEmpty(powerUser)) { - long userId = idService.getDateSeq(); - userModifyParam.setUserId(userId); - userModifyParam.setUserPwd(userProperties.getPassword()); - baseMapper.addUser(userModifyParam); - return true; - } - userModifyParam.setUserId(powerUser.getUserId()); - baseMapper.updateUser(userModifyParam); - return true; - } - - @Override - public boolean delUserByUserName(String userName) { - PowerUser powerUser = baseMapper.getUserByUserName(userName); - if (Func.isEmpty(powerUser)) { - return true; - } - baseMapper.delUserByUserName(userName); - return true; - } - - -} diff --git a/docus-sys/src/main/resources/mapper/PowerDeptMapper.xml b/docus-sys/src/main/resources/mapper/PowerDeptMapper.xml index 60e7b82..f387507 100644 --- a/docus-sys/src/main/resources/mapper/PowerDeptMapper.xml +++ b/docus-sys/src/main/resources/mapper/PowerDeptMapper.xml @@ -24,7 +24,7 @@ delete from `docus_system`.`power_dept` where `dept_code` = #{deptCode} - SELECT `dept_id`,`dept_code`,`dept_name` FROM `docus_system`.`power_dept` WHERE `dept_code` = #{deptCode} LIMIT 1 diff --git a/docus-sys/src/main/resources/mapper/PowerUserMapper.xml b/docus-sys/src/main/resources/mapper/PowerUserMapper.xml index 9d13962..9b1edd1 100644 --- a/docus-sys/src/main/resources/mapper/PowerUserMapper.xml +++ b/docus-sys/src/main/resources/mapper/PowerUserMapper.xml @@ -31,7 +31,7 @@ delete from `docus_system`.`power_user` where `user_name` = #{userName} - SELECT `user_id`,`user_name`,`user_pwd` FROM `docus_system`.`power_user` WHERE `user_name` = #{userName} LIMIT 1 diff --git a/his-sysem/pom.xml b/his-sysem/pom.xml index f5074bc..cf6974b 100644 --- a/his-sysem/pom.xml +++ b/his-sysem/pom.xml @@ -16,6 +16,12 @@ 1.0-SNAPSHOT compile + + com.docus + docus-medical-record + 1.0-SNAPSHOT + compile + diff --git a/his-sysem/src/main/java/com/docus/server/his/infrastructure/HisSysDao.java b/his-sysem/src/main/java/com/docus/server/his/infrastructure/HisSysDao.java index 92db339..23ebc83 100644 --- a/his-sysem/src/main/java/com/docus/server/his/infrastructure/HisSysDao.java +++ b/his-sysem/src/main/java/com/docus/server/his/infrastructure/HisSysDao.java @@ -1,9 +1,11 @@ package com.docus.server.his.infrastructure; import com.docus.server.his.infrastructure.mapper.HisDeptMapper; +import com.docus.server.his.infrastructure.mapper.HisTBasicMapper; import com.docus.server.his.infrastructure.mapper.HisUserMapper; -import com.docus.server.sys.pojo.dto.DeptDTO; -import com.docus.server.sys.pojo.dto.UserDTO; +import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.sys.common.pojo.dto.DeptDTO; +import com.docus.server.sys.common.pojo.dto.UserDTO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; @@ -17,6 +19,7 @@ public class HisSysDao { private final HisDeptMapper hisDeptMapper; private final HisUserMapper hisUserMapper; + private final HisTBasicMapper hisTBasicMapper; public List getDeptListView(Date startDate, Date endDate, long pageNum, long pageSize) { @@ -28,9 +31,11 @@ public class HisSysDao { return hisUserMapper.getUserListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize); } - public void getMedicalRecordListView() { } + public List getTBasicListView(Date startDate, Date endDate, long pageNum, long pageSize) { + return hisTBasicMapper.getTBasicListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize); + } } diff --git a/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisDeptMapper.java b/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisDeptMapper.java index 5ef7ed2..ec9ddc0 100644 --- a/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisDeptMapper.java +++ b/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisDeptMapper.java @@ -1,7 +1,7 @@ package com.docus.server.his.infrastructure.mapper; import com.baomidou.dynamic.datasource.annotation.DS; -import com.docus.server.sys.pojo.dto.DeptDTO; +import com.docus.server.sys.common.pojo.dto.DeptDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisTBasicMapper.java b/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisTBasicMapper.java new file mode 100644 index 0000000..5037e03 --- /dev/null +++ b/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisTBasicMapper.java @@ -0,0 +1,21 @@ +package com.docus.server.his.infrastructure.mapper; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.docus.server.record.pojo.dto.TBasicDTO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; + +@Mapper +@DS("his") +public interface HisTBasicMapper { + + List getTBasicListView(@Param("startDate") Date startDate, + @Param("endDate") Date endDate, + @Param("offset") long offset, + @Param("pageSize") long pageSize); + + +} diff --git a/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisUserMapper.java b/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisUserMapper.java index 6bc9266..1f112e5 100644 --- a/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisUserMapper.java +++ b/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisUserMapper.java @@ -1,7 +1,7 @@ package com.docus.server.his.infrastructure.mapper; import com.baomidou.dynamic.datasource.annotation.DS; -import com.docus.server.sys.pojo.dto.UserDTO; +import com.docus.server.sys.common.pojo.dto.UserDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -12,7 +12,10 @@ import java.util.List; @DS("his") public interface HisUserMapper { - List getUserListView(@Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("offset") long offset, @Param("pageSize") long pageSize); + List getUserListView(@Param("startDate") Date startDate, + @Param("endDate") Date endDate, + @Param("offset") long offset, + @Param("pageSize") long pageSize); } diff --git a/his-sysem/src/main/java/com/docus/server/his/service/IHisService.java b/his-sysem/src/main/java/com/docus/server/his/service/IHisService.java index 16b6c23..15a3939 100644 --- a/his-sysem/src/main/java/com/docus/server/his/service/IHisService.java +++ b/his-sysem/src/main/java/com/docus/server/his/service/IHisService.java @@ -1,13 +1,16 @@ package com.docus.server.his.service; -import com.docus.server.sys.pojo.dto.DeptDTO; -import com.docus.server.sys.pojo.dto.UserDTO; +import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.sys.common.pojo.dto.DeptDTO; +import com.docus.server.sys.common.pojo.dto.UserDTO; import java.util.Date; import java.util.List; public interface IHisService { - List getDeptListView(Date startDate, Date endDate, long pazeNum, long pageSize); + List getDeptListView(Date startDate, Date endDate, long pageNum, long pageSize); - List getUserListView(Date startDate, Date endDate, long pazeNum, long pageSize); + List getUserListView(Date startDate, Date endDate, long pageNum, long pageSize); + + List getTBasicListView(Date startDate, Date endDate, long pageNum, long pageSize); } diff --git a/his-sysem/src/main/java/com/docus/server/his/service/impl/HisService.java b/his-sysem/src/main/java/com/docus/server/his/service/impl/HisService.java index 45f3d07..2fee659 100644 --- a/his-sysem/src/main/java/com/docus/server/his/service/impl/HisService.java +++ b/his-sysem/src/main/java/com/docus/server/his/service/impl/HisService.java @@ -2,8 +2,9 @@ package com.docus.server.his.service.impl; import com.docus.server.his.infrastructure.HisSysDao; import com.docus.server.his.service.IHisService; -import com.docus.server.sys.pojo.dto.DeptDTO; -import com.docus.server.sys.pojo.dto.UserDTO; +import com.docus.server.record.pojo.dto.TBasicDTO; +import com.docus.server.sys.common.pojo.dto.DeptDTO; +import com.docus.server.sys.common.pojo.dto.UserDTO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; @@ -16,7 +17,6 @@ public class HisService implements IHisService { private final HisSysDao hisSysDao; - @Override public List getDeptListView(Date startDate, Date endDate, long pageNum, long pageSize) { return hisSysDao.getDeptListView(startDate, endDate, pageNum, pageSize); @@ -27,4 +27,9 @@ public class HisService implements IHisService { return hisSysDao.getUserListView(startDate, endDate, pageNum, pageSize); } + @Override + public List getTBasicListView(Date startDate, Date endDate, long pageNum, long pageSize) { + return hisSysDao.getTBasicListView(startDate, endDate, pageNum, pageSize); + } + } diff --git a/his-sysem/src/main/resources/mapper/HisDeptMapper.xml b/his-sysem/src/main/resources/mapper/HisDeptMapper.xml index 1596b58..66fb252 100644 --- a/his-sysem/src/main/resources/mapper/HisDeptMapper.xml +++ b/his-sysem/src/main/resources/mapper/HisDeptMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_dept` WHERE update_time between #{startDate} and #{endDate} order by update_time asc @@ -13,7 +13,7 @@ + + + + + + + + diff --git a/his-sysem/src/main/resources/mapper/HisUserMapper.xml b/his-sysem/src/main/resources/mapper/HisUserMapper.xml index 3d9bd5f..9aeae9b 100644 --- a/his-sysem/src/main/resources/mapper/HisUserMapper.xml +++ b/his-sysem/src/main/resources/mapper/HisUserMapper.xml @@ -4,8 +4,8 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_user` WHERE update_time between #{startDate} and #{endDate} order by update_time asc LIMIT #{offset}, #{pageSize} @@ -13,7 +13,7 @@