commit

DataFusion/res/config.properties

@@ -1,6 +1,8 @@
 #DB-connected partners
 #jdbcUrl_connected  = jdbc:sqlserver://192.168.1.215:1433;DatabaseName=DICOMSERVER
-jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
+jdbcUrl_connected  = jdbc:oracle:thin:@172.27.64.208:1521/orcl_rac
+#jdbcUrl_connected  = jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=150.101.94.13)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=xepacs20)))
+
 user_connected 	   = zlpacs
 password_connected = zlpacs
 #DATA-Parms

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

@@ -90,24 +90,24 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(arpLocal);
 		
 		//同步报告
-//		Cron4jPlugin cpData = new Cron4jPlugin();
-//		cpData.addTask("*/4 * * * *", new DataTask());
-//		me.add(cpData);
+		Cron4jPlugin cpData = new Cron4jPlugin();
+		cpData.addTask("*/4 * * * *", new DataTask());
+		me.add(cpData);
 //		
 //		//将cfind请求检查录入待检查库
-//		Cron4jPlugin inData = new Cron4jPlugin();
-//		inData.addTask("*/4 * * * *", new UpdateTask());
-//		me.add(inData);
+		Cron4jPlugin inData = new Cron4jPlugin();
+		inData.addTask("*/4 * * * *", new UpdateTask());
+		me.add(inData);
 //		
 //		//执行cfind请求
-//		Cron4jPlugin cgData = new Cron4jPlugin();
-//		cgData.addTask("*/2 * * * *", new CFindTask());
-//		me.add(cgData);
+		Cron4jPlugin cgData = new Cron4jPlugin();
+		cgData.addTask("*/2 * * * *", new CFindTask());
+		me.add(cgData);
 //		
 //		//comve获取检查影像
-//		Cron4jPlugin mvData = new Cron4jPlugin();
-//		mvData.addTask("*/2 * * * *", new CMoveTask());
-//		me.add(mvData);
+		Cron4jPlugin mvData = new Cron4jPlugin();
+		mvData.addTask("*/2 * * * *", new CMoveTask());
+		me.add(mvData);
 //		
 //		//更新患者信息
 //		Cron4jPlugin ifData = new Cron4jPlugin();

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

@@ -20,6 +20,7 @@ import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
+import com.jfinal.plugin.activerecord.dialect.OracleDialect;
 import com.jfinal.plugin.activerecord.dialect.SqlServerDialect;
 import com.jfinal.plugin.druid.DruidPlugin;
 import com.zskk.service.DataService;
@@ -55,7 +56,7 @@ public class ViewController extends Controller {
             druidPluginConnected.start();
 			// 配置ActiveRecord插件
 			ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-			arpConnected.setDialect(new SqlServerDialect());
+			arpConnected.setDialect(new OracleDialect());
 			arpConnected.start();
 
 		} catch (Exception e) {

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

@@ -25,11 +25,11 @@ public class DataTask implements ITask {
         JSONArray jsonArray = dService.getExamList(400);	
         for (Object object : jsonArray) {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from reportinfo where STUDYUID=?", jsonObject.getString("studyuid"));
+			Record record = Db.use("connected").findFirst("select * from reportinfo where ACCESSIONNUMBER=?", jsonObject.getString("accession_num"));
 			if (record == null) {
 				continue;
 			}
-			if (record.getStr("IMPRESSION") == null && record.getStr("DESCRPTION") == null && record.getStr("REVIEWDOCTOR") == null) {
+			if (record.getStr("IMPRESSION") == null && record.getStr("DESCRIPTION") == null && record.getStr("REVIEWDOCTOR") == null) {
 				continue;
 			}
 			Map<String, String> params = new HashMap<>();
@@ -41,7 +41,7 @@ public class DataTask implements ITask {
 			//报告医生姓名
 			params.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
 			//报告时间
-			params.put("report_datetime", record.getStr("REVIEWDATE"));
+			params.put("report_datetime", record.getStr("REPORTDATE"));
 			//审核医生姓名
 			params.put("review_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
 			//审核时间
@@ -53,16 +53,16 @@ public class DataTask implements ITask {
 			//意见建议
 			params.put("impression", record.getStr("IMPRESSION"));
 			//影像所见
-			params.put("description", record.getStr("DESCRPTION"));
+			params.put("description", record.getStr("DESCRIPTION"));
 			//exams表
 			//申请科室
 			params.put("application_department", record.getStr("DEPARTMENT")==null?"":record.getStr("DEPARTMENT"));
 			//申请医生
 			params.put("application_doctor", record.getStr("CLINICALDOCTOR")==null?"":record.getStr("CLINICALDOCTOR"));
 			//临床诊断
-			params.put("clin_diag", record.getStr("DIAGNOSE")==null?"":record.getStr("DIAGNOSE"));
+			params.put("clin_diag", record.getStr("DIAGNOSIS")==null?"":record.getStr("DIAGNOSIS"));
 			//症状
-			params.put("clin_symp", record.getStr("SYMPROM")==null?"":record.getStr("SYMPROM"));
+			params.put("clin_symp", record.getStr("SYMPTOM")==null?"":record.getStr("SYMPTOM"));
 			//patient_infos表
 			//患者姓名
 			params.put("name", record.getStr("PATIENTNAME"));
@@ -71,15 +71,15 @@ public class DataTask implements ITask {
 			//患者身份证号
 			params.put("card_num", record.getStr("IDCARD")==null?"":record.getStr("IDCARD"));
 			//检查结果1阴2阳
-			params.put("report_result", record.getStr("RESULT").contains("阳")?"2":"1");
+			params.put("report_result", record.getStr("RESULT").contains("是")?"2":"1");
 			//门诊号住院号
 			params.put("hopitalized_no", record.getStr("INPATIENTNUM")==null?"":record.getStr("INPATIENTNUM"));
 			//门诊号
 			params.put("out_patient", record.getStr("OUTPATIENTNUM")==null?"":record.getStr("OUTPATIENTNUM"));
 			//病人ID
-			params.put("his_patient_id", record.getStr("PATIENTID")==null?"":record.getStr("PATIENTID"));
+//			params.put("his_patient_id", record.getStr("PATIENTID")==null?"":record.getStr("PATIENTID"));
 			//检查方法
-			params.put("exam_project", record.getStr("PROIECT")==null?"":record.getStr("PROIECT"));
+			params.put("exam_project", record.getStr("PROJECT")==null?"":record.getStr("PROJECT"));
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.saveReport(params);

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

@@ -51,7 +51,7 @@ public class UpdateTask implements ITask {
 						for (int k = 0; k < attributeMap.getLength(); k++) {
 							if (attributeMap.item(k).getNodeName().equals("tag")) {
 								// 获取studyuid
-								if (attributeMap.item(k).getNodeValue().equals("0020000D")) {
+								if (attributeMap.item(k).getNodeValue().equals("00080050")) {
 									studyuidString = xmlHelper.getString(dicomAttributeList.item(j), "Value");
 									continue;
 								}