commit

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

@@ -26,7 +26,7 @@ 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=?",
+				Record record = Db.use("connected").findFirst("select * from zskk_reportinfo_1 where ACCESSIONNUMBER=?",
 						jsonObject.getString("patient_num"));
 				if (record == null) {
 					continue;

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

@@ -23,33 +23,17 @@ public class UpdateTask implements ITask {
         for (Object object : jsonArray) {
         	try {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from examtinfo where REGPAPERNUM=?", jsonObject.getString("patient_num"));
+			Record record = Db.use("connected").findFirst("select * from examtinfo where REPORTPAPERNUM=?", jsonObject.getString("patient_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_department", record.getStr("DEPARTMENT")==null?"":record.getStr("DEPARTMENT"));
 			//申请医生
-			params.put("application_doctor", "");
+			params.put("application_doctor", record.getStr("CLINICALDOCTOR")==null?"":record.getStr("CLINICALDOCTOR"));
 			//临床诊断
 			params.put("clin_diag", "");
 			//症状