From 83ca9abe898107c361550d5f7f99b1c841d3081d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 25 八月 2026 17:06:57 +0800
Subject: [PATCH] 【市一】出院数据同步规则调整

---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
index 8884243..3760141 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
@@ -108,7 +108,7 @@
         Integer count = 0;
         List<Map<String, Object>> syncList = utilsMapper.getList("SELECT id,syncName,DATE_FORMAT(ADDDATE(startTime, INTERVAL -1 MINUTE), '%Y-%m-%d %H:%i:%s') startTime  FROM sys_sync_time  where state=0");
         if (syncList.size() > 0) {
-            String endTime = chMapper.getSqlString("select sysdate from healthy_inhosp where rownum=1");
+            String endTime = chMapper.getSqlString("select (sysdate-1) as endtime from healthy_inhosp where rownum=1");
             //鍚屾鎮h�呭熀鏈俊鎭�
 //            List<Map<String, Object>> syncTemp = syncList.stream().filter(row -> row.get("syncName").equals("pat_archive")).collect(Collectors.toList());
 //            if (syncTemp.size() > 0) {
@@ -381,11 +381,15 @@
         PatMedOperationItem patMedOperationItem = new PatMedOperationItem();
         patMedOperationItem.setOrgid(operation.getOrgid());
         if(StringUtils.isNotEmpty(operation.getOpid())){
-            patMedOperationItem.setOpid(Long.valueOf(operation.getOpid()));
+            patMedOperationItem.setOpid(operation.getOpid());
+            patMedOperationItem.setLastStartTime(operation.getLastStartTime());
+            patMedOperationItem.setLastEndTime(operation.getLastEndTime());
             List<PatMedOperationItem> patMedOperationItems = chMapper.selectOperItemList(patMedOperationItem);
             log.info("鍚屾鎵嬫湳璇︽儏淇℃伅鏁伴噺" + patMedOperationItems.size());
             for (PatMedOperationItem operationItem : patMedOperationItems) {
                 try {
+                    operationItem.setInhospstate(operation.getInhospstate());
+                    operationItem.setSerialnum(operation.getSerialnum());
                     PatMedOperationItem operItem = new PatMedOperationItem();
                     operItem.setOpid(operationItem.getOpid());
                     operItem.setOperationid(operationItem.getOperationid());

--
Gitblit v1.9.3