feat:心电报告的查询参数处理

dataConfig/homeQualitySet.json

@@ -48,7 +48,10 @@
   //0点重新采集前几天数据 1:开启  0:关闭
   "intervalDayOpen": "1",
   //配置pacs补偿采集间隔天数
-  "intervalDay":3
+  "intervalDay":3,
-
+  // 心电报告开始时间从住院时间减去小时数量
+  "ecgAdmissDateHours": 6,
+  // 心电报告结束时间从出院时间加上小时数
+  "ecgDisDateHours": 60
 
 }

src/main/java/com/docus/bgts/config/MyScheduling.java

@@ -9,12 +9,6 @@ import com.docus.bgts.facade.IBgtsService;
 import com.docus.bgts.service.CheckIntegrityService;
 import com.docus.bgts.utils.FileUtils;
 import com.docus.bgts.utils.HttpUtils;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ThreadPoolExecutor;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +16,13 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ThreadPoolExecutor;
+
 @Component
 public class MyScheduling {
     @Value("${beat.url}")
@@ -73,7 +74,7 @@ public class MyScheduling {
     public static Map<String, String> getDateCollectionTime(Date date, int day) {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(date);
-        calendar.add(5, -day);
+        calendar.add(Calendar.DATE, -day);
         Date dBefore = calendar.getTime();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         String defaultStartDate = sdf.format(dBefore);

src/main/java/com/docus/bgts/service/BgtsServiceImpl.java

@@ -27,6 +27,18 @@ import com.docus.bgts.utils.FileUtils;
 import com.docus.bgts.utils.HttpUtils;
 import com.docus.bgts.utils.SnowflakeIdWorker;
 import com.docus.bgts.utils.XmlUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
+import org.apache.cxf.transport.http.HTTPConduit;
+import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dom4j.Element;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
 import java.io.ByteArrayInputStream;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -40,17 +52,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ThreadPoolExecutor;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
-import org.apache.cxf.transport.http.HTTPConduit;
-import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.dom4j.Element;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
 
 @Service
 public class BgtsServiceImpl implements IBgtsService {
@@ -507,17 +508,34 @@ public class BgtsServiceImpl implements IBgtsService {
         return map;
     }
 
+    public static void main(String[] args) {
+        getSmCollectionTimeEcg("2025-01-01 16:00:02", "2025-01-05 14:20:02");
+        System.out.println( getSmCollectionTimeEcg("2025-01-01 16:00:02", "2025-01-05 14:20:02"));
+
+
+    }
     public static Map<String, String> getSmCollectionTimeEcg(String admissDate, String disDate) {
         Calendar calendar = Calendar.getInstance();
         Map<String, String> map = new HashMap();
 
         try {
+            int admissDateAmountHours = 6;
+            int disDateAmountHours = 30;
+            Object ecgAdmissDateHours = FileUtils.getJsonByName("ecgAdmissDateHours");
+            Object ecgDisDateHours = FileUtils.getJsonByName("ecgDisDateHours");
+            if (ecgAdmissDateHours != null) {
+                admissDateAmountHours = Integer.parseInt(ecgAdmissDateHours.toString());
+            }
+            if (ecgDisDateHours != null) {
+                disDateAmountHours = Integer.parseInt(ecgDisDateHours.toString());
+            }
+
             calendar.setTime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).parse(admissDate));
-            calendar.add(10, -6);
+            calendar.add(Calendar.HOUR, -admissDateAmountHours);
             Date dBefore = calendar.getTime();
             Calendar calendar1 = Calendar.getInstance();
             calendar1.setTime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).parse(disDate));
-            calendar1.add(10, 30);
+            calendar1.add(Calendar.HOUR, disDateAmountHours);
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             String defaultStartDate = sdf.format(dBefore);
             String defaultEndDate = sdf.format(calendar1.getTime());