commit

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

@@ -1,5 +1,8 @@
 package com.zskk.task;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import com.alibaba.fastjson.JSON;
@@ -21,27 +24,28 @@ public class DataTask implements ITask {
         JSONArray jsonArray = dService.getExamList(30);	
         for (Object object : jsonArray) {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from PACSONLINE_Interface where STUDYUID=?", jsonObject.getString("studyuid"));
+			Record record = Db.use("connected").findFirst("select * from reportinfo where STUDYUID=?", jsonObject.getString("studyuid"));
 			if (record == null) {
 				continue;
 			}
 			if (record.getStr("IMPRESSION") == null && record.getStr("DESCRIPTION") == null) {
 				continue;
 			}
+			String timString = record.getStr("REPORTDATE");
 			Map<String, String> params = new HashMap<>();
 			params.put("exam_id", jsonObject.getString("id"));
 			//报告医生姓名
 			params.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
 			//报告时间
-			params.put("report_datetime", record.getStr("REPORTDATE"));
+			params.put("report_datetime", parseStringToDate(timString));
 			//审核医生姓名
 			params.put("review_doctor_name", record.getStr("REVIEWDOCTOR"));
 			//审核时间
-			params.put("review_datetime", record.getStr("REPORTDATE"));
+			params.put("review_datetime", parseStringToDate(timString));
 			//确认医生姓名
 			params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR"));
 			//确认时间
-			params.put("confirm_datetime", record.getStr("REPORTDATE"));
+			params.put("confirm_datetime", parseStringToDate(timString));
 			//意见建议
 			params.put("impression", record.getStr("IMPRESSION"));
 			//影像所见
@@ -59,9 +63,9 @@ public class DataTask implements ITask {
 			//患者姓名
 			params.put("name", record.getStr("PATIENTNAME"));
 			//患者手机号
-			params.put("phone", "");
+			params.put("phone", record.getStr("PHONE"));
 			//患者身份证号
-			params.put("card_num", record.getStr("IDCARD"));
+			params.put("card_num", "");
 			params.put("report_result", "0");
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
@@ -76,4 +80,27 @@ public class DataTask implements ITask {
 
 	}
 
+	/**
+	 * 日期字符串格式转换
+	 * @param dateStr
+	 * @return
+	 */
+	private String parseStringToDate(String dateStr) {
+		if (dateStr == null) {
+			return "";
+		}
+		SimpleDateFormat sdf= new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
+	    Date date = null;
+	    String timeString = null;
+		try {
+			date = sdf.parse(dateStr);
+			SimpleDateFormat sdf2= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+			timeString = sdf2.format(date);
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        return timeString;
+	}
 }