commit

DataFusion/res/config.properties

@@ -3,4 +3,4 @@ jdbcUrl_connected  = jdbc:oracle:thin:@10.1.100.1:1521:his
 user_connected     = hsefi
 password_connected = hsefi
 #DATA-Parms
-institution_id     = 73090004
+institution_id     = 73090004

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

@@ -64,13 +64,13 @@ public class ZskkConfig extends JFinalConfig {
 	@Override
 	public void configPlugin(Plugins me) {
 		// 配置数据库连接池插件
-//		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
-//		me.add(druidPluginConnected);
+		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
+		me.add(druidPluginConnected);
 //
 //		// 配置ActiveRecord插件
-//		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-//		arpConnected.setDialect(new OracleDialect());
-//		me.add(arpConnected);
+		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
+		arpConnected.setDialect(new OracleDialect());
+		me.add(arpConnected);
 
 		
 		Cron4jPlugin cpData = new Cron4jPlugin();

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

@@ -15,11 +15,6 @@ import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.activerecord.dialect.OracleDialect;
 import com.jfinal.plugin.druid.DruidPlugin;
-import com.zskk.model.Doctors;
-import com.zskk.model.Exams;
-import com.zskk.model.PatientInfos;
-import com.zskk.model.Report;
-import com.zskk.model.Studies;
 import okhttp3.FormBody;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;

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

@@ -17,12 +17,11 @@ public class DataTask implements ITask {
 	@Override
 	public void run() {
 		// TODO Auto-generated method stub
-
 		DataService dService = ServiceFactory.getService(DataService.class);
         JSONArray jsonArray = dService.getExamList(30);	
         for (Object object : jsonArray) {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from PACSONLINE_Interface where STUDYUID=?", jsonObject.getString("studyuid"));
+			Record record = Db.use("connected").findFirst("select * from reportinfo where STUDYUID=?", jsonObject.getString("studyuid"));
 			if (record == null) {
 				continue;
 			}
@@ -49,9 +48,9 @@ public class DataTask implements ITask {
 			params.put("description", record.getStr("DESCRIPTION"));
 			//exams表
 			//申请科室
-			params.put("application_department", record.getStr("DEPARTMENT"));
+			params.put("application_department", "");
 			//申请医生
-			params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
+			params.put("application_doctor", "");
 			//临床诊断
 			params.put("clin_diag", "");
 			//症状
@@ -60,9 +59,9 @@ public class DataTask implements ITask {
 			//患者姓名
 			params.put("name", record.getStr("PATIENTNAME"));
 			//患者手机号
-			params.put("phone", "");
+			params.put("phone", record.getStr("PHONE"));
 			//患者身份证号
-			params.put("card_num", record.getStr("IDCARD"));
+			params.put("card_num", "");
 			params.put("report_result", "0");
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
@@ -78,36 +77,4 @@ public class DataTask implements ITask {
 		
 	}
 	
-	private String creatId() {
-		UUID id=UUID.randomUUID();
-        String[] idd = id.toString().split("-");
-        return idd[0]+idd[1]+idd[2];
-	}
-	
-	private String getDoctorIdByName(String name) {
-		if (name == null) {
-			return null;
-		}
-		Doctors doctors = Doctors.dao.use("zskk").findFirst("SELECT * FROM doctors where instr(?,realname) and institution_id=44000003",name);
-		if (doctors == null) {
-			return null;
-		}
-		return doctors.getId();
-	}
-	
-	private Date parseStringToDate(String dateStr) {
-		if (dateStr == null) {
-			return new Date();
-		}
-		SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-	    Date date = null;
-		try {
-			date = sdf.parse(dateStr);
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-        return date;
-	}
-	
 }