commit

DataFusion/res/config.properties

@@ -1,13 +1,13 @@
 #DB-connected partners
-#jdbcUrl_connected  = jdbc:sqlserver://192.168.1.215:1433;DatabaseName=DICOMSERVER
-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 	   = c##xeyyx
-password_connected = xeyyx
+jdbcUrl_connected  = jdbc:sqlserver://10.1.105.217:1433;DatabaseName=qitris
+#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 	   = yxy
+password_connected = yxy
 #DATA-Parms
-institution_id     = 83000003
+institution_id     = 13300007
 
 #DB-connected partners
 jdbcUrl_local  = jdbc:mysql://127.0.0.1:3306/pacsonline?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
 #jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
 user_local	   = zskk
-password_local = Zskk_2021
+password_local = Zskk_2024

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

@@ -82,7 +82,7 @@ public class ZskkConfig extends JFinalConfig {
 
 		// 配置ActiveRecord插件
 		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-		arpConnected.setDialect(new OracleDialect());
+		arpConnected.setDialect(new SqlServerDialect());
 		me.add(arpConnected);
 		
 		ActiveRecordPlugin arpLocal = new ActiveRecordPlugin("local", druidPluginLocal);
@@ -110,19 +110,19 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(mvData);
 		
 		//更新患者信息
-		Cron4jPlugin ifData = new Cron4jPlugin();
-		ifData.addTask("*/1 * * * *", new InfoTask());
-		me.add(ifData);
-		
-		//同步报告
-		Cron4jPlugin upData = new Cron4jPlugin();
-		upData.addTask("*/12 * * * *", new ReviewTask());
-		me.add(upData);
-		
-		//二次CMOVE
-		Cron4jPlugin reData = new Cron4jPlugin();
-		reData.addTask("*/4 * * * *", new ReCMoveTask());
-		me.add(reData);
+//		Cron4jPlugin ifData = new Cron4jPlugin();
+//		ifData.addTask("*/1 * * * *", new InfoTask());
+//		me.add(ifData);
+//		
+//		//同步报告
+//		Cron4jPlugin upData = new Cron4jPlugin();
+//		upData.addTask("*/12 * * * *", new ReviewTask());
+//		me.add(upData);
+//		
+//		//二次CMOVE
+//		Cron4jPlugin reData = new Cron4jPlugin();
+//		reData.addTask("*/4 * * * *", new ReCMoveTask());
+//		me.add(reData);
 	}
 
 	@Override

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

@@ -70,7 +70,7 @@ public class CMoveTask implements ITask {
 						
 //						ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 //						tService.execute(() -> {
-							String execCmd = ExecUtil.execCmd("/zskk_system/other/cmove.sh " + studyidfind.getStr("studyuid"));
+							String execCmd = ExecUtil.execCmd("/zskk_system/other/cget.sh " + studyidfind.getStr("studyuid"));
 							if (execCmd.contains("Connection refused")) {
 								//状态2：错误
 								studyidfind.set("status", 2);

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 StudyInsUid=?", jsonObject.getString("studyuid"));
 			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<>();
@@ -39,47 +39,47 @@ public class DataTask implements ITask {
 
 			params.put("code", jsonObject.getString("id"));
 			//报告医生姓名
-			params.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
+			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"));
+			params.put("review_doctor_name", record.getStr("ReviewDoctor")==null?"":record.getStr("ReviewDoctor"));
 			//审核时间
-			params.put("review_datetime", record.getStr("REVIEWDATE"));
+			params.put("review_datetime", record.getStr("ReviewDate"));
 			//确认医生姓名
-			params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
+			params.put("confirm_doctor_name", record.getStr("ReviewDoctor")==null?"":record.getStr("ReviewDoctor"));
 			//确认时间
-			params.put("confirm_datetime", record.getStr("REVIEWDATE"));
+			params.put("confirm_datetime", record.getStr("ReviewDate"));
 			//意见建议
-			params.put("impression", record.getStr("IMPRESSION"));
+			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_department", record.getStr("ReqDept")==null?"":record.getStr("ReqDept"));
 			//申请医生
-			params.put("application_doctor", record.getStr("CLINICALDOCTOR")==null?"":record.getStr("CLINICALDOCTOR"));
+			params.put("application_doctor", record.getStr("ReqDoctor")==null?"":record.getStr("ReqDoctor"));
 			//临床诊断
-			params.put("clin_diag", record.getStr("DIAGNOSE")==null?"":record.getStr("DIAGNOSE"));
+			params.put("clin_diag", "");
 			//症状
-			params.put("clin_symp", record.getStr("SYMPROM")==null?"":record.getStr("SYMPROM"));
+			params.put("clin_symp", "");
 			//patient_infos表
 			//患者姓名
-			params.put("name", record.getStr("PATIENTNAME"));
+			params.put("name", record.getStr("PatName"));
 			//患者手机号
-			params.put("phone", record.getStr("PHONE")==null?"":record.getStr("PHONE"));
+			params.put("phone", record.getStr("Phone")==null?"":record.getStr("Phone"));
 			//患者身份证号
-			params.put("card_num", record.getStr("IDCARD")==null?"":record.getStr("IDCARD"));
+			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("PostitiveMark").contains("阳")?"2":"1");
 			//门诊号住院号
-			params.put("hopitalized_no", record.getStr("INPATIENTNUM")==null?"":record.getStr("INPATIENTNUM"));
+			params.put("hopitalized_no", record.getStr("InPatientNum")==null?"":record.getStr("InPatientNum"));
 			//门诊号
-			params.put("out_patient", record.getStr("OUTPATIENTNUM")==null?"":record.getStr("OUTPATIENTNUM"));
+			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("ExamBody")==null?"":record.getStr("ExamBody"));
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.saveReport(params);