commit

DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -72,9 +72,9 @@ public class ZskkConfig extends JFinalConfig {
 		arpConnected.setDialect(new SqlServerDialect());
 		me.add(arpConnected);
 
-//		Cron4jPlugin cpData = new Cron4jPlugin();
-//		cpData.addTask("*/5 * * * *", new DataTask());
-//		me.add(cpData);
+		Cron4jPlugin cpData = new Cron4jPlugin();
+		cpData.addTask("*/5 * * * *", new DataTask());
+		me.add(cpData);
 	}
 
 	@Override

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,47 +24,47 @@ 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 AccessionNumber=?", jsonObject.getString("accession_num"));
 			if (record == null) {
 				continue;
 			}
-			if (record.getStr("IMPRESSION") == null && record.getStr("DESCRIPTION") == null) {
+			if (record.getStr("ReportResult") == null && record.getStr("ReportDiagnose") == null) {
 				continue;
 			}
 			Map<String, String> params = new HashMap<>();
 			params.put("exam_id", jsonObject.getString("id"));
 			//报告医生姓名
-			params.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
+			params.put("report_doctor_name", "");
 			//报告时间
-			params.put("report_datetime", record.getStr("REPORTDATE"));
+			params.put("report_datetime", parseStringToDate(record.getStr("PostExamApproveDate")));
 			//审核医生姓名
-			params.put("review_doctor_name", record.getStr("REVIEWDOCTOR"));
+			params.put("review_doctor_name", "");
 			//审核时间
-			params.put("review_datetime", record.getStr("REPORTDATE"));
+			params.put("review_datetime", parseStringToDate(record.getStr("PostExamApproveDate")));
 			//确认医生姓名
-			params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR"));
+			params.put("confirm_doctor_name", "");
 			//确认时间
-			params.put("confirm_datetime", record.getStr("REPORTDATE"));
+			params.put("confirm_datetime", parseStringToDate(record.getStr("PostExamApproveDate")));
 			//意见建议
-			params.put("impression", record.getStr("IMPRESSION"));
+			params.put("impression", record.getStr("ReportResult"));
 			//影像所见
-			params.put("description", record.getStr("DESCRIPTION"));
+			params.put("description", record.getStr("ReportDiagnose"));
 			//exams表
 			//申请科室
-			params.put("application_department", record.getStr("DEPARTMENT"));
+			params.put("application_department", record.getStr("PreExamFrom"));
 			//申请医生
-			params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
+			params.put("application_doctor", "");
 			//临床诊断
 			params.put("clin_diag", "");
 			//症状
 			params.put("clin_symp", "");
 			//patient_infos表
 			//患者姓名
-			params.put("name", record.getStr("PATIENTNAME"));
+			params.put("name", record.getStr("NameCN"));
 			//患者手机号
-			params.put("phone", "");
+			params.put("phone", record.getStr("phone")==null?"":record.getStr("phone"));
 			//患者身份证号
-			params.put("card_num", record.getStr("IDCARD"));
+			params.put("card_num", record.getStr("idcard")==null?"":record.getStr("idcard"));
 			params.put("report_result", "0");
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
@@ -75,5 +78,23 @@ public class DataTask implements ITask {
 		// TODO Auto-generated method stub
 
 	}
+	
+	private String parseStringToDate(String dateStr) {
+		if (dateStr == null) {
+			return "";
+		}
+		SimpleDateFormat sdf= new SimpleDateFormat("yyyy/MM/dd");
+	    Date date = null;
+	    String dateString = null;
+		try {
+			date = sdf.parse(dateStr);
+			SimpleDateFormat sdf2= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			dateString = sdf2.format(date);
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        return dateString;
+	}
 
 }