From 2867cf7076a584a34e63174cec0a8b89cdd03e4c Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 06 十一月 2026 13:42:55 +0800
Subject: [PATCH] Merge branch 'master' into smartor_ls_261103
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/CollectHISController.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/CollectHISController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/CollectHISController.java
index 67b4806..5cf62bb 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/CollectHISController.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/CollectHISController.java
@@ -8,6 +8,7 @@
import com.ruoyi.datacollection.domain.HnDataGatherVO;
import com.ruoyi.common.core.domain.entity.Icd10;
import com.ruoyi.datacollection.service.IHNGatherPatArchiveService;
+import com.smartor.common.SpecificArchiveConstants;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -41,6 +42,24 @@
}
/**
+ * 閲囬泦涓芥按甯傚骞间繚鍋ラ櫌闂ㄨ瘖鎺ヨ瘖瀹屾垚璁板綍锛屽苟鐢熸垚濡囩/鍎跨妗ｆ銆�
+ * 璇锋眰浣撳彲浼� startTime銆乪ndTime锛坹yyy-MM-dd 鎴� yyyy-MM-dd HH:mm:ss锛夛紝涓嶄紶榛樿閲囬泦鏄ㄥぉ銆�
+ */
+ @PostMapping("/collectMchArchive")
+ @ApiOperation("閲囬泦涓芥按濡囧辜闂ㄨ瘖鎺ヨ瘖瀹屾垚璁板綍骞剁敓鎴愪笓绉戞。妗�")
+ public AjaxResult collectMchArchive(@RequestBody(required = false) HnDataGatherVO hnDataGatherVO) {
+ try {
+ HnDataGatherVO request = hnDataGatherVO != null ? hnDataGatherVO : new HnDataGatherVO();
+ Integer count = ichService.collectMchOuthospAndGenerateArchive(
+ SpecificArchiveConstants.LISHUI_MCH_ORG_ID, request.getStartTime(), request.getEndTime());
+ return AjaxResult.success(count);
+ } catch (Exception ex) {
+ log.error("閲囬泦涓芥按濡囧辜闂ㄨ瘖鎺ヨ瘖瀹屾垚璁板綍澶辫触", ex);
+ return AjaxResult.error(ex.getMessage());
+ }
+ }
+
+ /**
* 鏌ヨ鐤剧梾鍒楄〃鏁版嵁閲囬泦
*/
@PostMapping("/collectIcd10")
--
Gitblit v1.9.3