From 2943d0bb77c843bcf19645a366f98b8592efece9 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 09 九月 2026 09:53:50 +0800
Subject: [PATCH] 【市一】手术详情同步

---
 ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml                       |    6 ++++++
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java |    4 +---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java      |   10 ++++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index 2d51004..169c80b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -994,9 +994,7 @@
     @PostMapping("/syncMedOperForShiyi")
     public AjaxResult syncMedOperForShiyi(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime) {
         // 绔嬪嵆杩斿洖锛屽悗鍙板紓姝ユ墽琛�
-        CompletableFuture.runAsync(() -> {
-            collectHISService.syncOper(startTime, endTime);
-        });
+        collectHISService.syncOper(startTime, endTime);
         return AjaxResult.success("鍚屾浠诲姟宸插惎鍔紝璇风◢鍚庢煡鐪嬬粨鏋�");
     }
 
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 524a234..fc3499a 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
@@ -454,8 +454,14 @@
         if(StringUtils.isNotEmpty(operation.getOpid())){
             PatMedOperationItem patMedOperationItem = new PatMedOperationItem();
             //patMedOperation.opReqid = patMedOperationItem.operationid
-            patMedOperationItem.setOperationid(operation.getOpreqid());
-            List<PatMedOperationItem> patMedOperationItems = chMapper.selectOperItemList(patMedOperationItem);
+            List<PatMedOperationItem> patMedOperationItems = new ArrayList<>();
+            if (ObjectUtils.isNotEmpty(operation.getOpreqid())){
+                patMedOperationItem.setOperationid(operation.getOpreqid());
+                patMedOperationItems = chMapper.selectOperItemList(patMedOperationItem);
+            }else {
+                log.info("鍚屾鎵嬫湳璇︽儏淇℃伅:鎵嬫湳鐢宠鍗旾D涓虹┖!");
+                return count;
+            }
 
             PatMedOperationItem operItem = new PatMedOperationItem();
             operItem.setOperationid(operation.getOpreqid());
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
index c88cd19..9443222 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -899,6 +899,9 @@
         <if test="orgid != null and orgid != ''">
             AND o.orgid = #{orgid}
         </if>
+        <if test="opreqid != null and opreqid != ''">
+            AND o.opreqid = #{opreqid}
+        </if>
         <if test="lastStartTime != null and lastStartTime != ''">
             and to_char(o.last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') >= #{lastStartTime}
         </if>
@@ -941,6 +944,9 @@
         <if test="opid != null and opid != ''">
             AND oi.opid = #{opid}
         </if>
+        <if test="operationid != null and operationid != ''">
+            AND oi.operationid = #{operationid}
+        </if>
         <if test="lastStartTime != null and lastStartTime != ''">
             and oi.last_Update_Time &gt;= to_date(#{lastStartTime}, 'YYYY-MM-DD HH24:MI:SS')
         </if>

--
Gitblit v1.9.3