commit

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

@@ -24,7 +24,7 @@ public class DataTask implements ITask {
         JSONArray jsonArray = dService.getExamList(100);	
         for (Object object : jsonArray) {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from reportinfo where AccessionNumber=?", jsonObject.getString("accession_num"));
+			Record record = Db.use("connected").findFirst("select * from reportinfo where StudyInsUid=?", jsonObject.getString("studyuid"));
 
 			if (record == null) {
 				continue;
@@ -69,17 +69,17 @@ public class DataTask implements ITask {
 			//患者手机号
 			params.put("phone", record.getStr("Phone")==null?"":record.getStr("Phone"));
 			//患者身份证号
-			params.put("card_num", record.getStr("PatAge")==null?"":record.getStr("PatAge"));
+			params.put("card_num", record.getStr("IDCard")==null?"":record.getStr("IDCard"));
 			//检查结果1阴2阳
-			params.put("report_result", record.getStr("Result").contains("1")?"2":"1");
+			params.put("report_result", record.getStr("Result").contains("阴")?"1":"2");
 			//门诊号住院号
 			params.put("hopitalized_no", record.getStr("InPatientNum")==null?"":record.getStr("InPatientNum"));
 			//门诊号
 			params.put("out_patient", record.getStr("OutPatientNum")==null?"":record.getStr("OutPatientNum"));
 			//病人ID
-			params.put("his_patient_id", record.getStr("PatientNum")==null?"":record.getStr("PatientNum"));
+			params.put("his_patient_id", record.getStr("Patientid")==null?"":record.getStr("Patientid"));
 			//检查方法
-			params.put("exam_project", record.getStr("ExamBody")==null?"":record.getStr("ExamBody"));
+			params.put("exam_project", record.getStr("ExamItem")==null?"":record.getStr("ExamItem"));
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.saveReport(params);