wangfeng 6 роки тому
батько
коміт
1421b6fdeb

+ 13 - 20
tran-service/src/main/java/com/diagbot/facade/DockingImportFacade.java

@@ -4,6 +4,7 @@ package com.diagbot.facade;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -40,12 +41,8 @@ public class DockingImportFacade {
             LisRetrieveDTO list = new LisRetrieveDTO();
             list.setGroupName("呼吸道病毒三联检" + i);
             list.setInspectDoctor("admin" + i);// TODO 测试数据
-            try {
-            	list.setInspectTime(StringToDate(i));// TODO 测试数据
-				list.setReportTime(StringToDate(i));
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
+            list.setInspectTime(getNextDay(DateUtil.now(),i));// TODO 测试数据
+			list.setReportTime(getNextDay(DateUtil.now(),i));
             list.setSpecimenType("血清" + i);// TODO 测试数据
             lisRetrieveDTO.add(list);
         }
@@ -116,12 +113,8 @@ public class DockingImportFacade {
             list.setApplicationDate("2019-05-31 "+i+":00:00");
             list.setCheckNum("123456" + i);// TODO 测试数据
             list.setName("心电图" + i);// TODO 测试数据
-            try {
-            	list.setInspectTime(StringToDate(i));// TODO 测试数据
-				list.setReportTime(StringToDate(i));
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
+            list.setInspectTime(getNextDay(DateUtil.now(),i));// TODO 测试数据
+            list.setReportTime(getNextDay(DateUtil.now(),i));// TODO 测试数据
             list.setApplicationNum("8888" + i);// TODO 测试数据
             list.setType(i);// TODO 测试数据
             pacsRetrieveDTO.add(list);// TODO 测试数据
@@ -148,13 +141,13 @@ public class DockingImportFacade {
         pacsDataDTO.setPacsResultDTO(pacsExcelWrapper);// TODO 测试数据
         return pacsDataDTO;// TODO 测试数据
     }
-    //字符串转换成Date
-    public static Date StringToDate(int i) throws ParseException  {
-        String strDate = "2019-05-15";
-        String format2 = "yyyy-MM-dd HH:mm:ss";
-        String Time =strDate+ i+":00:00";
-        SimpleDateFormat sdf = new SimpleDateFormat(format2);
-        return sdf.parse(Time);
-
+    //当天时间加i
+    
+    public static Date getNextDay(Date date,int i ) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.DAY_OF_MONTH, +i);//+1今天的时间加一天
+        date = calendar.getTime();
+        return date;
     }
 }