commit

DataFusion/src/com/zskk/service/DataService.java

@@ -17,9 +17,9 @@ import okhttp3.Response;
 
 public class DataService {
 	
-    private static String GET_EXAM_URL = "http://117.50.71.166:9600/zskkapi/butt/getExam";
+    private static String GET_EXAM_URL = "https://risserver3.pacsonline.cn/butt/getExam";
     
-    private static String SAVE_REPORT_URL = "http://117.50.71.166:9600/zskkapi/butt/saveReport";
+    private static String SAVE_REPORT_URL = "https://risserver3.pacsonline.cn/butt/saveReport";
 	
     private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient();
     

DataFusion/src/com/zskk/task/DataTask.java

@@ -72,15 +72,15 @@ public class DataTask implements ITask {
 				// 报告医生姓名
 				params.put("report_doctor_name", reportdoctor);
 				// 报告时间
-				params.put("report_datetime", parseStringToDate(reportdate).toString());
+				params.put("report_datetime", parseStringToDate(reportdate));
 				// 审核医生姓名
 				params.put("review_doctor_name", reviewdoctor);
 				// 审核时间
-				params.put("review_datetime", parseStringToDate(reportdate).toString());
+				params.put("review_datetime", parseStringToDate(reportdate));
 				// 确认医生姓名
 				params.put("confirm_doctor_name", reviewdoctor);
 				// 确认时间
-				params.put("confirm_datetime", parseStringToDate(reportdate).toString());
+				params.put("confirm_datetime", parseStringToDate(reportdate));
 				// 意见建议
 				params.put("impression", impression);
 				// 影像所见
@@ -119,19 +119,25 @@ public class DataTask implements ITask {
 
 	}
 
-	private Date parseStringToDate(String dateStr) {
+	private String parseStringToDate(String dateStr) {
 		if (dateStr == null) {
-			return new Date();
+			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			String dateStringnew = formatter.format(new Date());
+			return dateStringnew;
 		}
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
 		Date date = null;
+		String dateString = "";
 		try {
 			date = sdf.parse(dateStr);
+			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			dateString = formatter.format(date);
+
 		} catch (ParseException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		return date;
+		return dateString;
 	}
 
 }