commit

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

@@ -62,14 +62,14 @@ public class ZskkConfig extends JFinalConfig {
 		_MappingKit.mapping(arpZskk);
 		me.add(arpZskk);
 
-		// 配置数据库连接池插件
-		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
-		me.add(druidPluginConnected);
-
-		// 配置ActiveRecord插件
-		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-		arpConnected.setDialect(new OracleDialect());
-		me.add(arpConnected);
+//		// 配置数据库连接池插件
+//		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
+//		me.add(druidPluginConnected);
+//
+//		// 配置ActiveRecord插件
+//		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
+//		arpConnected.setDialect(new OracleDialect());
+//		me.add(arpConnected);
 		
 //		Cron4jPlugin cpData = new Cron4jPlugin();
 //		cpData.addTask("*/10 * * * *", new DataTask());

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

@@ -5,7 +5,6 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
-
 import com.jfinal.core.Controller;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
@@ -17,6 +16,7 @@ import com.zskk.model.Studies;
 
 public class ViewController extends Controller {
 
+	
 	/**
 	 * 在被连接数据库执行sql语句
 	 */
@@ -36,10 +36,10 @@ public class ViewController extends Controller {
 				report.setCreatedAt(new Date());
 				report.setReportResult(record.getStr("FITEM_RESULT_CODE").contains("阴")?"1":"2");
 				report.setReportDoctorId(getDoctorIdByName(record.getStr("REPORTDOCTOR")));
-				report.setReviewDoctorId(getDoctorIdByName(record.getStr("REVIEWDOCTOR")));
-				report.setReviewDatetime(aaa(record.getStr("REPORTDATE")));
-				report.setConfirmDoctorId(getDoctorIdByName(record.getStr("REVIEWDOCTOR")));
-				report.setConfirmDatetime(aaa(record.getStr("REPORTDATE")));
+//				report.setReviewDoctorId(getDoctorIdByName(record.getStr("REVIEWDOCTOR")));
+//				report.setReviewDatetime(aaa(record.getStr("REPORTDATE")));
+//				report.setConfirmDoctorId(getDoctorIdByName(record.getStr("REVIEWDOCTOR")));
+//				report.setConfirmDatetime(aaa(record.getStr("REPORTDATE")));
 				report.save();
 				PatientInfos patientInfos = PatientInfos.dao.use("zskk").findById(exams2.getPatientId());
 				patientInfos.setName(record.getStr("PATIENTNAME"));
@@ -64,7 +64,7 @@ public class ViewController extends Controller {
 		}
 		Doctors doctors = Doctors.dao.use("zskk").findFirst("SELECT * FROM doctors where realname like ? and institution_id=73090001",name);
 		if (doctors == null) {
-			return null;
+			return "1";
 		}
 		return doctors.getId();
 	}