COMMIT

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

@@ -25,7 +25,14 @@ public class DataTask implements ITask {
         for (Object object : jsonArray) {
         	try {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from zlhis.zskk_reportinfo_1 where ACCESSIONNUMBER=?", jsonObject.getString("accession_num"));
+			Record record = null;
+			if (jsonObject.getString("exam_class").equals("CT")) {
+				record = Db.use("connected").findFirst("select * from zlhis.zskk_reportinfo_1 where STUDYUID=?", jsonObject.getString("patient_num"));
+
+			}else {
+				record = Db.use("connected").findFirst("select * from zlhis.zskk_reportinfo_1 where ACCESSIONNUMBER=?", jsonObject.getString("accession_num"));
+
+			}
 			if (record == null) {
 				continue;
 			}

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

@@ -26,7 +26,14 @@ public class InfoTask implements ITask {
         for (Object object : jsonArray) {
         	try {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from zlhis.examtinfo where REPORTPAPERNUM=?", jsonObject.getString("accession_num"));
+			Record record = null;
+			if (jsonObject.getString("exam_class").equals("CT")) {
+				record = Db.use("connected").findFirst("select * from zlhis.zskk_reportinfo_1 where STUDYUID=?", jsonObject.getString("patient_num"));
+
+			}else {
+				record = Db.use("connected").findFirst("select * from zlhis.zskk_reportinfo_1 where ACCESSIONNUMBER=?", jsonObject.getString("accession_num"));
+
+			}
 			if (record == null) {
 				continue;
 			}