添加缺失jar包

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

@@ -9,7 +9,6 @@ import com.jfinal.config.Routes;
 import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
-import com.jfinal.plugin.activerecord.dialect.OracleDialect;
 import com.jfinal.plugin.activerecord.dialect.SqlServerDialect;
 import com.jfinal.plugin.cron4j.Cron4jPlugin;
 import com.jfinal.plugin.druid.DruidPlugin;
@@ -53,7 +52,7 @@ public class ZskkConfig extends JFinalConfig {
 
 	public static DruidPlugin createConnectedDruidPlugin() {
 
-		return new DruidPlugin(PropKit.get("jdbcUrl_connected"), PropKit.get("user_connected"),PropKit.get("password_connected"));
+		return new DruidPlugin(PropKit.get("jdbcUrl_connected"), PropKit.get("user_connected"),PropKit.get("password_connected").trim());
 	}
 
 	@Override

DataFusion/src/com/zskk/control/ViewController.java

@@ -7,7 +7,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 import com.jfinal.core.Controller;
-import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
@@ -101,10 +100,9 @@ public class ViewController extends Controller {
 	}
 	
 	private String creatId() {
-//		UUID id = UUID.randomUUID();
-//        String[] idd =id.toString().split("-");
-//		return idd[0]+idd[1]+idd[2];
-		return null;
+		UUID id = UUID.randomUUID();
+        String[] idd= id.toString().split("-");
+		return idd[0]+idd[1]+idd[2];
 	}
 	
 	private String getDoctorIdByName(String name) {

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

@@ -25,14 +25,14 @@ public class DataTask implements ITask {
 			List<Exams> exams = Exams.dao.use("zskk").find("SELECT * FROM pacsonline.exams where exam_status=3 and institution_id=01000001 order by createdAt desc limit 50");
 			for (Exams exams2 : exams) {
 				Studies studies = Studies.dao.use("zskk").findById(exams2.getStudyId());
-				Record record = Db.use("connected").findFirst("select * from reportinfo where studyuid=?",studies.getStudyuid());
+				Record record = Db.use("connected").findFirst("select * from reportinfo where accessionNumber=?",studies.getAccessionNum());
 				if (record == null) {
 					continue;
 				}
 				Report report = new Report().use("zskk");
 				report.setId(creatId());
 				report.setReportDatetime(parseStringToDate(record.getStr("reportdate")));
-				if (record.getStr("IMPRESSION") == null && record.getStr("DESCRIPTION") == null) {
+				if (record.getStr("impression") == null && record.getStr("description") == null) {
 					continue;
 				}
 				report.setImpression(record.getStr("impression"));
@@ -70,7 +70,7 @@ public class DataTask implements ITask {
 	
 	private String creatId() {
 		UUID id=UUID.randomUUID();
-        String[] idd = id.toString().split("-");
+        String[] idd =id.toString().split("-");
         return idd[0]+idd[1]+idd[2];
 	}