commit

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

@@ -100,9 +100,9 @@ public class DataTask implements ITask {
 					// 手机号
 					data.put("phone", record.getStr("PHONE")==null?"":record.getStr("PHONE"));
 					// 患者生日
-					data.put("birthday", "");
+					data.put("birthday", patientInfos.getBirthday());
 					// 患者检查时年龄
-					data.put("patient_age", "");
+					data.put("patient_age", patientInfos.getAge());
 					// 阴阳性 1阴性 2阳性
 					data.put("report_result", record.getStr("RESULT").contains("阳")?"2":"1");
 					// 报告时间 10位时间戳
@@ -259,7 +259,7 @@ public class DataTask implements ITask {
 			Date aDate = new Date();
 			return String.valueOf(aDate.getTime() / 1000);
 		}		
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
 		return String.valueOf(sdf.parse(data).getTime() / 1000);
 	}
@@ -302,7 +302,7 @@ public class DataTask implements ITask {
 		if (dateStr == null || dateStr.equals(" ")) {
 			return new Date();
 		}
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		Date date = null;
 		try {
 			date = sdf.parse(dateStr);