commit

DataFusion/res/config.properties

@@ -1,6 +1,6 @@
 #DB-connected partners
-jdbcUrl_connected  = jdbc:oracle:thin:@192.168.1.101:1521:orcl11g
-user_connected 	   = OT
-password_connected = OT
+jdbcUrl_connected  = jdbc:oracle:thin:@10.116.1.50:1521:orcl
+user_connected     = zskk
+password_connected = 123
 #DATA-Parms
-institution_id     = 81069902
+institution_id     = 04500002

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

@@ -1,8 +1,5 @@
 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;
@@ -24,7 +21,7 @@ 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 zlhis.zskk_reportinfo_1 where STUDYUID=?", jsonObject.getString("accession_num"));
 			if (record == null) {
 				continue;
 			}
@@ -34,63 +31,51 @@ public class DataTask implements ITask {
 			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", record.getStr("REPORTDOCTOR"));
 			//报告时间
-			params.put("report_datetime",record.getStr("REPORTDATE"));
+			params.put("report_datetime", record.getStr("STUDY_DATE"));
 			//审核医生姓名
-			params.put("review_doctor_name",record.getStr("REVIEWDOCTOR"));
+			params.put("review_doctor_name", record.getStr("REVIEWDOCTOR"));
 			//审核时间
-			params.put("review_datetime",record.getStr("REPORTDATE"));
+			params.put("review_datetime", record.getStr("STUDY_DATE"));
 			//确认医生姓名
-			params.put("confirm_doctor_name",record.getStr("REVIEWDOCTOR"));
+			params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR"));
 			//确认时间
-			params.put("confirm_datetime",record.getStr("REPORTDATE"));
+			params.put("confirm_datetime", record.getStr("STUDY_DATE"));
 			//意见建议
-			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("DEPATMENT"));
 			//申请医生
 			params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
 			//临床诊断
-			params.put("clin_diag", "");
+			params.put("clin_diag", record.getStr("DIAGNOSIS"));
+			//症状
+			params.put("clin_symp", "");
 			//patient_infos表
 			//患者姓名
-			params.put("name",record.getStr("PATIENTNAME"));
+			params.put("name", record.getStr("PATIENTNAME"));
 			//患者手机号
-			params.put("phone", "");
+			params.put("phone", record.getStr("PHONE"));
 			//患者身份证号
-			params.put("card_num", "");
+			params.put("card_num", record.getStr("IDCARD"));
 			params.put("report_result", "0");
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.saveReport(params);
 			});	
         }
-			
-    }
+	}
+
 
 	@Override
 	public void stop() {
 		// TODO Auto-generated method stub
-
+		
 	}
-
-	private Date parseStringToDate(String dateStr) {
-		if (dateStr == null) {
-			return new Date();
-		}
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		Date date = null;
-		try {
-			date = sdf.parse(dateStr);
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return date;
-	}
-
+	
+	
 }