diff --git a/src/main/java/com/shibofu/spring/controller/UserController.java b/src/main/java/com/shibofu/spring/controller/UserController.java deleted file mode 100644 index 8c8a751..0000000 --- a/src/main/java/com/shibofu/spring/controller/UserController.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.shibofu.spring.controller; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author potter.fu - * @date 2018-12-07 15:38 - */ -@RestController -@RequestMapping("/user") -public class UserController { - -} diff --git a/src/main/java/com/shibofu/spring/db1/dao/ArchiveMasterDao.java b/src/main/java/com/shibofu/spring/db1/dao/ArchiveMasterDao.java index 3df1f4a..27a3032 100644 --- a/src/main/java/com/shibofu/spring/db1/dao/ArchiveMasterDao.java +++ b/src/main/java/com/shibofu/spring/db1/dao/ArchiveMasterDao.java @@ -20,7 +20,7 @@ public interface ArchiveMasterDao { List PollingPacsAnXu(); - //查询24小时内出院病历 + //查询168小时内出院病历 List PacsEveryWeekPolling(); diff --git a/src/main/java/com/shibofu/spring/db1/service/PacsPollingService.java b/src/main/java/com/shibofu/spring/db1/service/PacsPollingService.java index f896da7..38728af 100644 --- a/src/main/java/com/shibofu/spring/db1/service/PacsPollingService.java +++ b/src/main/java/com/shibofu/spring/db1/service/PacsPollingService.java @@ -22,19 +22,17 @@ public interface PacsPollingService { * @author linjj * @date: 2024/1/18 9:29 */ - Msg PacsEveryDayPolling() ; + void PacsEveryDayPolling() ; Msg pacsAnxu(); - - /** * @description: 定时查询每星期出院患者 * @author linjj * @date: 2024/1/18 9:29 */ - Msg PacsEveryWeekPolling() ; + Msg PacsEveryWeekPolling(); /** * @description: pacs按需采集 * @author linjj diff --git a/src/main/java/com/shibofu/spring/db1/serviceImpl/PacsPollingServiceImpl.java b/src/main/java/com/shibofu/spring/db1/serviceImpl/PacsPollingServiceImpl.java index c6b8004..b79f4e4 100644 --- a/src/main/java/com/shibofu/spring/db1/serviceImpl/PacsPollingServiceImpl.java +++ b/src/main/java/com/shibofu/spring/db1/serviceImpl/PacsPollingServiceImpl.java @@ -24,10 +24,7 @@ import org.springframework.util.ObjectUtils; import java.io.File; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @ClassName PollingServiceImpl @@ -52,13 +49,12 @@ public class PacsPollingServiceImpl implements PacsPollingService { private PacsDao pacsDao; @Override - public Msg PacsEveryDayPolling() { + public void PacsEveryDayPolling() { List archiveMasterVos = archiveMasterDao.PollingPacs(); - if (CollectionUtils.isEmpty(archiveMasterVos)) { - return Msg.fail("无需采集数据"); + if (!CollectionUtils.isEmpty(archiveMasterVos)) { + logger.info("一共："+archiveMasterVos.size()+"条病历!!!!"); + gather(archiveMasterVos); } - gather(archiveMasterVos); - return Msg.success("采集完成"); } @Override @@ -88,6 +84,7 @@ public class PacsPollingServiceImpl implements PacsPollingService { if (CollectionUtils.isEmpty(archiveMasterVos)) { return Msg.fail("无需采集数据"); } + logger.info("一共："+archiveMasterVos.size()+"条病历!!!!"); gather(archiveMasterVos); return Msg.success("采集完成"); } @@ -131,6 +128,7 @@ public class PacsPollingServiceImpl implements PacsPollingService { logger.info("该住院号时间内无数据" + list.getInpNo() + "住院次数为:" + list.getVisitId()); continue; } + logger.info("住院号为："+list.getInpNo() + "住院次数为:" + list.getVisitId()+"当前记录为:"+vo.size()+"条"); //插入文件表数据集合 List ArchiveDetailList = new ArrayList<>(); //需要同步的数据 @@ -182,7 +180,8 @@ public class PacsPollingServiceImpl implements PacsPollingService { ArchiveDetailDto archiveDetailDto = new ArchiveDetailDto(); archiveDetailDto.setMasterId(dto.getId()); archiveDetailDto.setUploadDateTime(new Date()); - archiveDetailDto.setAssortId("EABEEB5D628449A7930F4C0A9953A754"); + String emrAssort = getEmrAssort(pacsList.getProf()); + archiveDetailDto.setAssortId(emrAssort); archiveDetailDto.setSource("pacs"); archiveDetailDto.setFlag("0"); archiveDetailDto.setTitle(pacsList.getExamItem()); @@ -194,4 +193,36 @@ public class PacsPollingServiceImpl implements PacsPollingService { logger.info("-----------------住院号:" + list.getInpNo() + ",文件名:" + pacsList.getExamItem() + "解析不返回图片"); } } + + + public static String getEmrAssort(String prof) { + Map map = new HashMap<>(); + map.put("1", "DA342ED81CEE4A8EA827424626F3F577"); + map.put("2", "DA342ED81CEE4A8EA827424626F3F577"); + map.put("3", "DA342ED81CEE4A8EA827424626F3F577"); + map.put("4", "DA342ED81CEE4A8EA827424626F3F577"); + map.put("5", "DA342ED81CEE4A8EA827424626F3F577"); + map.put("6", "DA342ED81CEE4A8EA827424626F3F577"); + map.put("7", "DA342ED81CEE4A8EA827424626F3F577"); + map.put("8", "DA342ED81CEE4A8EA827424626F3F577"); + map.put("9", "DA342ED81CEE4A8EA827424626F3F577"); + map.put("20", "DA342ED81CEE4A8EA827424626F3F577"); + map.put("22", "DA342ED81CEE4A8EA827424626F3F577"); + map.put("23", "DA342ED81CEE4A8EA827424626F3F577"); + map.put("24", "DA342ED81CEE4A8EA827424626F3F577"); + map.put("25", "DA342ED81CEE4A8EA827424626F3F577"); + map.put("26", "DA342ED81CEE4A8EA827424626F3F577"); + map.put("27", "DA342ED81CEE4A8EA827424626F3F577"); + map.put("28", "DA342ED81CEE4A8EA827424626F3F577"); + map.put("29", "DA342ED81CEE4A8EA827424626F3F577"); + map.put("30", "DE599D770E8347CCB5122BC357D96F37"); + map.put("32", "DA342ED81CEE4A8EA827424626F3F577"); + map.put("33", "DA342ED81CEE4A8EA827424626F3F577"); + map.put("34", "DA342ED81CEE4A8EA827424626F3F577"); + map.put("36", "DE599D770E8347CCB5122BC357D96F37"); + map.put("37", "DE599D770E8347CCB5122BC357D96F37"); + map.put("38", "DE599D770E8347CCB5122BC357D96F37"); + map.put("39", "DA342ED81CEE4A8EA827424626F3F577"); + return map.get(prof); + } } diff --git a/src/main/java/com/shibofu/spring/vo/PacsVo.java b/src/main/java/com/shibofu/spring/vo/PacsVo.java index d8ceb5a..acc5825 100644 --- a/src/main/java/com/shibofu/spring/vo/PacsVo.java +++ b/src/main/java/com/shibofu/spring/vo/PacsVo.java @@ -15,4 +15,6 @@ public class PacsVo { private String accessionnumber; //文件名 private String ExamItem; + + private String prof; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 84421fa..ae301f6 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -9,15 +9,21 @@ server.port=3391 #spring.datasource.hikari.db2.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver - +#sqlserver spring.datasource.hikari.db1.jdbc-url=jdbc:sqlserver://10.36.116.108:1433;DatabaseName=emr_record spring.datasource.hikari.db1.username=sa spring.datasource.hikari.db1.password=xjgs+docus911 spring.datasource.hikari.db1.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver +#sqlserver spring.datasource.hikari.db2.jdbc-url=jdbc:sqlserver://10.36.116.100:1433;DatabaseName=pacsdb spring.datasource.hikari.db2.username=AP spring.datasource.hikari.db2.password=AP spring.datasource.hikari.db2.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver +#pg +spring.datasource.hikari.db3.jdbc-url=jdbc:postgresql://localhost:5432/School +spring.datasource.hikari.db3.username=sassssddss +spring.datasource.hikari.db3.password=AP +spring.datasource.hikari.db3.driver-class-name=org.hsqldb.jdbcDriver diff --git a/src/main/resources/mapper/db1/ArchiveMasterMapper.xml b/src/main/resources/mapper/db1/ArchiveMasterMapper.xml index d02c3f8..857ce86 100644 --- a/src/main/resources/mapper/db1/ArchiveMasterMapper.xml +++ b/src/main/resources/mapper/db1/ArchiveMasterMapper.xml @@ -55,7 +55,9 @@ admission_date_time AS admissionDateTime, discharge_date_time AS dischargeDateTime FROM - archive_master order by discharge_date_time ASC + archive_master + where discharge_date_time BETWEEN '2024-04-01 00:00:00' AND '2024-05-14 23:59:59' + order by discharge_date_time ASC SELECT accessionnumber, - ExamItem + ExamItem, + prof FROM pacsdb.dbo.AutoPrint_1 WHERE RegisterDT BETWEEN DATEADD(hh, -6, #{admissionDateTime}) and DATEADD(hh, 6, #{dischargeDateTime}) AND (OutHospitalNo = #{inpNo} OR InHospitalNo = #{inpNo} OR PhysicalNumber = #{inpNo} ) diff --git a/src/main/resources/sql/money.sql b/src/main/resources/sql/money.sql deleted file mode 100644 index 5102c1d..0000000 --- a/src/main/resources/sql/money.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE `money` ( - `id` int(33) NOT NULL AUTO_INCREMENT COMMENT '主键', - `basic` int(33) DEFAULT NULL COMMENT '基本工资', - `reward` int(33) DEFAULT NULL COMMENT '奖金', - `punishment` int(33) DEFAULT NULL COMMENT '惩罚金', - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; \ No newline at end of file diff --git a/src/main/resources/sql/user.sql b/src/main/resources/sql/user.sql deleted file mode 100644 index f3f8b36..0000000 --- a/src/main/resources/sql/user.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE `user` ( - `id` int(13) NOT NULL AUTO_INCREMENT COMMENT '主键', - `name` varchar(33) DEFAULT NULL COMMENT '姓名', - `age` int(3) DEFAULT NULL COMMENT '年龄', - `money` double DEFAULT NULL COMMENT '账户余额', - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; \ No newline at end of file