commit

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

@@ -79,13 +79,13 @@ public class ZskkConfig extends JFinalConfig {
 		cpData.addTask("*/5 * * * *", new DataTask());
 		me.add(cpData);
 		
-//		Cron4jPlugin upData = new Cron4jPlugin();
-//		upData.addTask("*/12 * * * *", new UpdateTask());
-//		me.add(upData);
+		Cron4jPlugin upData = new Cron4jPlugin();
+		upData.addTask("*/12 * * * *", new UpdateTask());
+		me.add(upData);
 		
-		Cron4jPlugin infoData = new Cron4jPlugin();
-		infoData.addTask("*/2 * * * *", new InfoTask());
-		me.add(infoData);
+//		Cron4jPlugin infoData = new Cron4jPlugin();
+//		infoData.addTask("*/2 * * * *", new InfoTask());
+//		me.add(infoData);
 		
 //		Cron4jPlugin payData = new Cron4jPlugin();
 //		payData.addTask("*/1 * * * *", new PayTask());

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

@@ -28,7 +28,7 @@ public class UpdateTask implements ITask {
 //        for (Object object : jsonArray) {
 //        	try {
 //			JSONObject jsonObject = JSON.parseObject(object.toString());
-			List<Record> records = Db.use("connected").find("select * from (select * from reportinfo order by REVIEWDATE desc) where rownum<100");
+			List<Record> records = Db.use("connected").find("select top 20 * from reportinfo order by UpDateTime desc");
 			for (Record record : records) {
 				if (record == null) {
 					continue;
@@ -38,47 +38,55 @@ public class UpdateTask implements ITask {
 				}
 				Map<String, String> params = new HashMap<>();
 				//1:exam_id 2:patient_num 3:accession_num 4:study_uid
-				params.put("type", "2");
+				params.put("type", "4");
 				
 				params.put("institution_id", PropKit.get("institution_id"));
 
-				params.put("code", record.getStr("ACCESSIONNUMBER"));
+				params.put("code", record.getStr("study_uid"));
 				//报告医生姓名
-				params.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
+				params.put("report_doctor_name", record.getStr("ReportDoctor"));
 				//报告时间
-				params.put("report_datetime", parseStringToDate(record.getStr("REVIEWDATE")));
+				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("REPORTDATE")));
+				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", "0");
-				//门诊号住院号
-				params.put("hopitalized_no", "");
+				params.put("report_result", record.getStr("Result").contains("阳")?"2":"1");
+//				params.put("report_result", "");
+
+				//住院号
+				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);