commit

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

@@ -71,22 +71,22 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(druidPluginConnected);
 
 		// 配置ActiveRecord插件
-//		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);
-//		
+		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 upData = new Cron4jPlugin();
 //		upData.addTask("*/12 * * * *", new UpdateTask());
 //		me.add(upData);
-//		
-//		Cron4jPlugin infoData = new Cron4jPlugin();
-//		infoData.addTask("*/5 * * * *", new InfoTask());
-//		me.add(infoData);
-//		
+		
+		Cron4jPlugin infoData = new Cron4jPlugin();
+		infoData.addTask("*/5 * * * *", new InfoTask());
+		me.add(infoData);
+		
 //		Cron4jPlugin payData = new Cron4jPlugin();
 //		payData.addTask("*/1 * * * *", new PayTask());
 //		me.add(payData);

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 ACCESSIONNUMBER=?", jsonObject.getString("patient_num"));
+			Record record = Db.use("connected").findFirst("select * from reportinfo where StudyInsUid=?", jsonObject.getString("study_uid"));
 			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,43 +41,49 @@ 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", parseStringToDate(record.getStr("REPORTDATE")));
+			params.put("report_datetime",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", parseStringToDate(record.getStr("REVIEWDATE")));
+			params.put("review_datetime", 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", parseStringToDate(record.getStr("REVIEWDATE")));
+			params.put("confirm_datetime", 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("ReqDept"));
 			//申请医生
-			params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
+			params.put("application_doctor", record.getStr("ReqDoctor"));
 			//临床诊断
-			params.put("clin_diag", record.getStr("DIAGNOSIS")==null?"":record.getStr("DIAGNOSIS"));
+			params.put("clin_diag", record.getStr("Diagnosis")==null?"":record.getStr("Diagnosis"));
 			//症状
-			params.put("clin_symp", record.getStr("SYMPTOM")==null?"":record.getStr("SYMPTOM"));
+			params.put("clin_symp", record.getStr("Symptom")==null?"":record.getStr("Symptom"));
 			//patient_infos表
 			//患者姓名
-			params.put("name", record.getStr("PATIENTNAME"));
+			params.put("name", record.getStr("PatName"));
 			//患者手机号
-			params.put("phone", record.getStr("PHONE")==null?"":record.getStr("PHONE"));
+			params.put("phone", record.getStr("Phone")==null?"":record.getStr("Phone"));
 			//患者身份证号
-			params.put("card_num", record.getStr("IDCARD")==null?"":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", "");
+			params.put("report_result", record.getStr("Result").contains("阳")?"2":"1");
+//			params.put("report_result", "");
 
 			//住院号
-			params.put("hopitalized_no", "");
+			params.put("hopitalized_no", record.getStr("InPatientNum"));
+			//门诊号
+			params.put("out_patient", record.getStr("OutPatientNum"));
+			//病人ID
+//			params.put("his_patient_id", record.getStr("InPatientNum"));
+			//检查方法
+			params.put("exam_project", record.getStr("ExamItem"));
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.saveReport(params);

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

@@ -26,50 +26,40 @@ public class InfoTask implements ITask {
         for (Object object : jsonArray) {
         	try {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from examtinfo where ACCESSIONNUMBER=?", jsonObject.getString("patient_num"));
+			Record record = Db.use("connected").findFirst("select * from examtinfo where StudyInsUid=?", jsonObject.getString("study_uid"));
 			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", parseStringToDate());
-			//审核医生姓名
-			params.put("review_doctor_name", "");
-			//审核时间
-			params.put("review_datetime", parseStringToDate());
-			//确认医生姓名
-			params.put("confirm_doctor_name", "");
-			//确认时间
-			params.put("confirm_datetime", parseStringToDate());
-			//意见建议
-			params.put("impression", "");
-			//影像所见
-			params.put("description", "");
 			//exams表
 			//申请科室
-			params.put("application_department", record.getStr("DEPARTMENT"));
+			params.put("application_department", record.getStr("ReqDept"));
 			//申请医生
-			params.put("application_doctor","");
+			params.put("application_doctor", record.getStr("ReqDoctor"));
 			//临床诊断
-			params.put("clin_diag", record.getStr("DIAGNOSIS")==null?"":record.getStr("DIAGNOSIS"));
+			params.put("clin_diag", record.getStr("Diagnosis")==null?"":record.getStr("Diagnosis"));
 			//症状
-			params.put("clin_symp", record.getStr("SYMPTOM")==null?"":record.getStr("SYMPTOM"));
+			params.put("clin_symp", record.getStr("Symptom")==null?"":record.getStr("Symptom"));
 			//patient_infos表
 			//患者姓名
-			params.put("name", record.getStr("PATIENTNAME"));
+			params.put("name", record.getStr("PatName"));
 			//患者手机号
-			params.put("phone", record.getStr("PHONE")==null?"":record.getStr("PHONE"));
+			params.put("phone", record.getStr("Phone")==null?"":record.getStr("Phone"));
 			//患者身份证号
-			params.put("card_num", record.getStr("IDCARD")==null?"":record.getStr("IDCARD"));
+			params.put("card_num", record.getStr("IDCard")==null?"":record.getStr("IDCard"));
 			//检查结果1阴2阳
-			params.put("report_result", "0");
+//			params.put("report_result", record.getStr("Result").contains("阳")?"2":"1");
+			params.put("report_result", "");
+
 			//住院号
-			params.put("hopitalized_no", record.getStr("HOPITALIZED_NO")==null?"":record.getStr("HOPITALIZED_NO"));
+			params.put("hopitalized_no", record.getStr("InPatientNum"));
 			//门诊号
-			params.put("out_patient", record.getStr("PAT_NO")==null?"":record.getStr("PAT_NO"));
+			params.put("out_patient", record.getStr("OutPatientNum"));
+			//病人ID
+//			params.put("his_patient_id", record.getStr("InPatientNum"));
+			//检查方法
+			params.put("exam_project", record.getStr("ExamItem"));
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.updatePatientInfo(params);