commit

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

@@ -68,13 +68,13 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(druidPluginConnected);
 
 		// 配置ActiveRecord插件
-//		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-//		arpConnected.setDialect(new SqlServerDialect());
-//		me.add(arpConnected);
+		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
+		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

@@ -26,11 +26,11 @@ public class DataTask implements ITask {
         for (Object object : jsonArray) {
         	try {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from reportinfo 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").isBlank() && record.getStr("DESCRIPTION").isBlank()) {
+			if (record.getStr("impression").isBlank() && record.getStr("description").isBlank()) {
 				continue;
 			}
 			Map<String, String> params = new HashMap<>();
@@ -41,47 +41,47 @@ public class DataTask implements ITask {
 
 			params.put("code", jsonObject.getString("id"));
 			//报告医生姓名
-			params.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
+			params.put("report_doctor_name", record.getStr("reportdoctor"));
 			//报告时间
-			params.put("report_datetime", record.getStr("REPORTDATE"));
+			params.put("report_datetime", parseStringToDate(record.getStr("reportdate")));
 			//审核医生姓名
-			params.put("review_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
+			params.put("review_doctor_name", record.getStr("reviewdoctor")==null?"":record.getStr("reviewdoctor"));
 			//审核时间
-			params.put("review_datetime", record.getStr("REPORTDATE"));
+			params.put("review_datetime", parseStringToDate(record.getStr("reviewdate")));
 			//确认医生姓名
-			params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
+			params.put("confirm_doctor_name", record.getStr("reviewdoctor")==null?"":record.getStr("reviewdoctor"));
 			//确认时间
-			params.put("confirm_datetime", record.getStr("REPORTDATE"));
+			params.put("confirm_datetime", parseStringToDate(record.getStr("reviewdate")));
 			//意见建议
-			params.put("impression", record.getStr("IMPRESSION"));
+			params.put("impression", record.getStr("impression"));
 			//影像所见
-			params.put("description", record.getStr("DESCRIPTION"));
+			params.put("description", record.getStr("description"));
 			//exams表
 			//申请科室
-			params.put("application_department", record.getStr("DEPARTMENT"));
+			params.put("application_department", record.getStr("department")==null?"":record.getStr("department"));
 			//申请医生
-			params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
+			params.put("application_doctor", record.getStr("clinicaldoctor")==null?"":record.getStr("clinicaldoctor"));
 			//临床诊断
-			params.put("clin_diag", record.getStr("clin_diag")==null?"":record.getStr("clin_diag"));
+			params.put("clin_diag", record.getStr("diagnosis")==null?"":record.getStr("diagnosis"));
 			//症状
-			params.put("clin_symp", record.getStr("clin_symp")==null?"":record.getStr("clin_symp"));
+			params.put("clin_symp", record.getStr("symptom")==null?"":record.getStr("symptom"));
 			//patient_infos表
 			//患者姓名
-			params.put("name", record.getStr("PATIENTNAME"));
+			params.put("name", record.getStr("patientname"));
 			//患者手机号
 			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"));
 			//检查结果1阴2阳
-			params.put("report_result", record.getStr("result").contains("阳")?"2":"1");
+			params.put("report_result", record.getStr("result").contains("1")?"2":"1");
 			//住院号
-//			params.put("hopitalized_no", record.getStr("patientNumber"));
+			params.put("hopitalized_no", record.getStr("inPatientNum")==null?"":record.getStr("inPatientNum"));
 			//门诊号
-//			params.put("out_patient", record.getStr("patientNumber"));
+			params.put("out_patient", record.getStr("outPatientNum")==null?"":record.getStr("outPatientNum"));
 			//病人ID
-//			params.put("his_patient_id", record.getStr("patientNumber"));
+			params.put("his_patient_id", record.getStr("patientid")==null?"":record.getStr("patientid"));
 			//检查方法
-			params.put("exam_project", record.getStr("patientNumber"));
+			params.put("exam_project", record.getStr("project")==null?"":record.getStr("project"));
 
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
@@ -109,7 +109,7 @@ public class DataTask implements ITask {
 		if (dateStr == null) {
 			return "";
 		}
-		SimpleDateFormat sdf= new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
+		SimpleDateFormat sdf= new SimpleDateFormat("yyyyMMdd");
 	    Date date = null;
 	    String timeString = null;
 		try {