commit

DataFusion/res/config.properties

@@ -1,8 +1,6 @@
 #DB-connected partners
 #jdbcUrl_connected  = jdbc:sqlserver://196.196.100.251:1433;DatabaseName=PACS
-#jdbcUrl_connected  = jdbc:oracle:thin:@172.16.100.59:1521:PACSORCL
-jdbcUrl_connected  = jdbc:oracle:thin:@//172.16.100.59:1521/PACSORCL
-
+jdbcUrl_connected  = jdbc:oracle:thin:@172.16.100.59:1521:PACSORCL
 user_connected 	   = yytpacs
 password_connected = pacs
 #DATA-Parms

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

@@ -18,6 +18,7 @@ import com.jfinal.template.Engine;
 import com.zskk.control.ViewController;
 import com.zskk.service.ServiceFactory;
 import com.zskk.task.DataTask;
+import com.zskk.task.UpdateTask;
 
 public class ZskkConfig extends JFinalConfig {
 
@@ -68,13 +69,17 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(druidPluginConnected);
 
 		// 配置ActiveRecord插件
-//		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-//		arpConnected.setDialect(new OracleDialect());
-//		me.add(arpConnected);
-
-//		Cron4jPlugin cpData = new Cron4jPlugin();
-//		cpData.addTask("*/5 * * * *", new DataTask());
-//		me.add(cpData);
+		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
+		arpConnected.setDialect(new OracleDialect());
+		me.add(arpConnected);
+
+		Cron4jPlugin cpData = new Cron4jPlugin();
+		cpData.addTask("*/5 * * * *", new DataTask());
+		me.add(cpData);
+		
+		Cron4jPlugin upData = new Cron4jPlugin();
+		upData.addTask("*/2 * * * *", new UpdateTask());
+		me.add(upData);
 	}
 
 	@Override

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

@@ -21,15 +21,15 @@ public class DataTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-        JSONArray jsonArray = dService.getExamList(50);	
+        JSONArray jsonArray = dService.getExamList(80);	
         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 medreport.v_reportinfo where STUDYID=?", jsonObject.getString("accession_num"));
 			if (record == null) {
 				continue;
 			}
-			if (record.getStr("IMPRESSION").isBlank() && record.getStr("DESCRIPTION").isBlank()) {
+			if (record.getStr("REPORTDIAGNOSIS").isBlank() && record.getStr("REPORTFINDING").isBlank()) {
 				continue;
 			}
 			Map<String, String> params = new HashMap<>();
@@ -37,45 +37,45 @@ public class DataTask implements ITask {
 			//报告医生姓名
 			params.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
 			//报告时间
-			params.put("report_datetime", record.getStr("REPORTDATE"));
+			params.put("report_datetime", record.getStr("REPRTDATE"));
 			//审核医生姓名
-			params.put("review_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
+			params.put("review_doctor_name", record.getStr("APPROVEDOCTOR")==null?"":record.getStr("APPROVEDOCTOR"));
 			//审核时间
-			params.put("review_datetime", record.getStr("REPORTDATE"));
+			params.put("review_datetime", record.getStr("APPROVEDATE"));
 			//确认医生姓名
-			params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
+			params.put("confirm_doctor_name", record.getStr("APPROVEDOCTOR")==null?"":record.getStr("APPROVEDOCTOR"));
 			//确认时间
-			params.put("confirm_datetime", record.getStr("REPORTDATE"));
+			params.put("confirm_datetime", record.getStr("APPROVEDATE"));
 			//意见建议
-			params.put("impression", record.getStr("IMPRESSION"));
+			params.put("impression", record.getStr("REPORTDIAGNOSIS"));
 			//影像所见
-			params.put("description", record.getStr("DESCRIPTION"));
+			params.put("description", record.getStr("REPORTFINDING"));
 			//exams表
 			//申请科室
-			params.put("application_department", record.getStr("DEPARTMENT"));
+			params.put("application_department", record.getStr("ORDERDEPARTMENT"));
 			//申请医生
-			params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
+			params.put("application_doctor", record.getStr("ORDERDOCTOR"));
 			//临床诊断
 			params.put("clin_diag", "");
 			//症状
 			params.put("clin_symp", "");
 			//patient_infos表
 			//患者姓名
-			params.put("name", record.getStr("PATIENTNAME"));
+			params.put("name", record.getStr("PNAME"));
 			//患者手机号
-			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"));
 			//检查结果1阴2阳
 			params.put("report_result", "0");
 			//住院号
-//			params.put("hopitalized_no", record.getStr("patientNumber"));
+			params.put("hopitalized_no", record.getStr("INHOSPITALNUM")==null?"":record.getStr("INHOSPITALNUM"));
 			//门诊号
-//			params.put("out_patient", record.getStr("patientNumber"));
+			params.put("out_patient", record.getStr("OUTHOSPITALNUM")==null?"":record.getStr("OUTHOSPITALNUM"));
 			//病人ID
-//			params.put("his_patient_id", record.getStr("patientNumber"));
+			params.put("his_patient_id", record.getStr("JZKH")==null?"":record.getStr("JZKH"));
 			//检查方法
-			params.put("exam_project", record.getStr("patientNumber"));
+			params.put("exam_project", record.getStr("STUDYITEM")==null?"":record.getStr("STUDYITEM"));
 
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {

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

@@ -1,13 +1,89 @@
 package com.zskk.task;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jfinal.plugin.activerecord.Db;
+import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.cron4j.ITask;
+import com.zskk.service.DataService;
+import com.zskk.service.ServiceFactory;
+import com.zskk.service.ThreadPoolService;
 
 public class UpdateTask implements ITask {
 
 	@Override
 	public void run() {
-		// TODO Auto-generated method stub
+		// TODO Auto-generated method stub // TODO Auto-generated method stub
+		DataService dService = ServiceFactory.getService(DataService.class);
+		JSONArray jsonArray = dService.getExamList(10);
+		for (Object object : jsonArray) {
+			try {
+				JSONObject jsonObject = JSON.parseObject(object.toString());
+				Record record = Db.use("connected").findFirst("select * from medreport.v_examinfo where STUDYID=?",
+						jsonObject.getString("accession_num"));
+				if (record == null) {
+					continue;
+				}
+				Map<String, String> params = new HashMap<>();
+				params.put("exam_id", jsonObject.getString("id"));
+				// 报告医生姓名
+				params.put("report_doctor_name", "");
+				// 报告时间
+				params.put("report_datetime", "");
+				// 审核医生姓名
+				params.put("review_doctor_name", "");
+				// 审核时间
+				params.put("review_datetime", "");
+				// 确认医生姓名
+				params.put("confirm_doctor_name", "");
+				// 确认时间
+				params.put("confirm_datetime", "");
+				// 意见建议
+				params.put("impression", "");
+				// 影像所见
+				params.put("description", "");
+				// exams表
+				// 申请科室
+				params.put("application_department", "");
+				// 申请医生
+				params.put("application_doctor", "");
+				// 临床诊断
+				params.put("clin_diag", "");
+				// 症状
+				params.put("clin_symp", "");
+				// patient_infos表
+				// 患者姓名
+				params.put("name", record.getStr("PNAME"));
+				// 患者手机号
+				params.put("phone", record.getStr("PHONE") == null ? "" : record.getStr("PHONE"));
+				// 患者身份证号
+				params.put("card_num", record.getStr("IDCARD") == null ? "" : record.getStr("IDCARD"));
+				// 检查结果1阴2阳
+				params.put("report_result", "0");
+				// 住院号
+				params.put("hopitalized_no",
+						record.getStr("INHOSPITALNUM") == null ? "" : record.getStr("INHOSPITALNUM"));
+				// 门诊号
+				params.put("out_patient",
+						record.getStr("OUTHOSPITALNUM") == null ? "" : record.getStr("OUTHOSPITALNUM"));
+				// 病人ID
+				params.put("his_patient_id", record.getStr("JZKH") == null ? "" : record.getStr("JZKH"));
+				// 检查方法
+				params.put("exam_project", record.getStr("STUDYITEM") == null ? "" : record.getStr("STUDYITEM"));
 
+				ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+				tService.execute(() -> {
+					dService.updatePatientInfo(params);
+				});
+			} catch (Exception e) {
+				// TODO: handle exception
+				continue;
+			}
+		}
 	}
 
 	@Override