commit

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

@@ -21,11 +21,11 @@ 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(300);	
         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 ris.reportinfo1 where STUDYUID=?", jsonObject.getString("studyuid"));
 			if (record == null) {
 				continue;
 			}
@@ -54,9 +54,9 @@ public class DataTask implements ITask {
 			//申请科室
 			params.put("application_department", record.getStr("DEPARTMENT"));
 			//申请医生
-			params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
+			params.put("application_doctor", record.getStr("CLINICALDOCTOR")==null?"":record.getStr("CLINICALDOCTOR"));
 			//临床诊断
-			params.put("clin_diag", "");
+			params.put("clin_diag", record.getStr("DIAGNOSIS")==null?"":record.getStr("DIAGNOSIS"));
 			//症状
 			params.put("clin_symp", "");
 			//patient_infos表
@@ -67,9 +67,9 @@ public class DataTask implements ITask {
 			//患者身份证号
 			params.put("card_num", record.getStr("IDCARD")==null?"":record.getStr("IDCARD"));
 			//检查结果1阴2阳
-			params.put("report_result", record.getStr("PATIENTNAME").equals("1")?"2":"1");
+			params.put("report_result", "0");
 			//门诊号住院号
-			params.put("hopitalized_no", record.getStr("patientNumber"));
+//			params.put("hopitalized_no", record.getStr("patientNumber"));
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.saveReport(params);