commit

DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -87,18 +87,22 @@ public class ZskkConfig extends JFinalConfig {
 		arpLocal.setDialect(new MysqlDialect());
 		me.add(arpLocal);
 		
+		//报告匹配
 		Cron4jPlugin cpData = new Cron4jPlugin();
 		cpData.addTask("*/5 * * * *", new DataTask());
 		me.add(cpData);
 		
+		//患者信息
 		Cron4jPlugin upData = new Cron4jPlugin();
 		upData.addTask("*/1 * * * *", new UpdateTask());
 		me.add(upData);
 		
+		//审核后更新
 		Cron4jPlugin reData = new Cron4jPlugin();
 		reData.addTask("*/12 * * * *", new ReviewTask());
 		me.add(reData);
 		
+		//超声匹配
 		Cron4jPlugin usData = new Cron4jPlugin();
 		usData.addTask("*/8 * * * *", new USReportTask());
 		me.add(usData);

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

@@ -26,7 +26,7 @@ public class DataTask implements ITask {
         JSONArray jsonArray = dService.getExamList(80);	
         for (Object object : jsonArray) {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from reportinfo_NEW where studyuid=?", jsonObject.getString("studyuid"));
+			Record record = Db.use("connected").findFirst("select * from reportinfo where studyuid=?", jsonObject.getString("studyuid"));
 			if (record == null) {
 				continue;
 			}

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

@@ -18,7 +18,7 @@ public class ReviewTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-		List<Record> records = Db.use("connected").find("select top 20 * from reportinfo_NEW order by reviewdate desc");
+		List<Record> records = Db.use("connected").find("select top 20 * from reportinfo order by reviewdate desc");
 		for (Record record : records) {
 			try {
 				if (record == null) {

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

@@ -25,7 +25,7 @@ public class USReportTask implements ITask {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
 
-		List<Record> records = Db.use("connected").find("select top 10 * from reportinfo_NEW where modality = 'US' order by reviewdate desc");
+		List<Record> records = Db.use("connected").find("select top 10 * from reportinfo where modality = 'US' order by reviewdate desc");
 		for (Record record : records) {
 			Record recordus = Db.use("local").findFirst("select * from usexam where code = ?", record.getStr("studyuid"));
 			if (recordus != null) {