1

DataFusion/WebRoot/WEB-INF/classes/.gitignore

@@ -1 +0,0 @@
-/com/

DataFusion/WebRoot/WEB-INF/classes/config.properties

@@ -0,0 +1,12 @@
+#DB-ZhongShiKangKai and connected partners
+jdbcUrl_zskk  = jdbc:mysql://www.pacsonline.cn:3306/pacsonline?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
+user_zskk 	  = pacs
+password_zskk = ZSKK@2017~!@#
+
+jdbcUrl_connected  = jdbc:sqlserver://192.168.118.46:1433;DatabaseName=medexmemrs
+user_connected 	   = MDKS
+password_connected = MDKS
+
+jdbcUrl_connected2  = jdbc:oracle:thin:@192.168.113.20:1521:SPACS
+user_connected2     = zskk_yyx
+password_connected2 = zskk_yyx

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

@@ -8,9 +8,6 @@ import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.cron4j.ITask;
 import com.zskk.model.Doctors;
 import com.zskk.model.Exams;
-import com.zskk.model.Report;
-import com.zskk.service.ServiceFactory;
-import com.zskk.service.WeixinService;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -39,9 +36,9 @@ public class DataTask implements ITask {
 				if (record == null) {
 					continue;
 				}
-				Report report = new Report().use("zskk");
-				report.setId(creatId());
-				report.setReportDatetime(parseStringToDate(record.getStr("reportdate")));
+				//Report report = new Report().use("zskk");
+				//report.setId(creatId());
+				//report.setReportDatetime(parseStringToDate(record.getStr("reportdate")));
 				if (record.getStr("impression") == null && record.getStr("description") == null) {
 					continue;
 				}
@@ -102,8 +99,8 @@ public class DataTask implements ITask {
 				exams2.setExamClass(record.getStr("modality"));
 				exams2.setExamStatus(9);
 				exams2.update();*/
-				WeixinService wService = ServiceFactory.getService(WeixinService.class);
-				wService.requestWeixinQrcode(report.getId());;
+				//WeixinService wService = ServiceFactory.getService(WeixinService.class);
+				//wService.requestWeixinQrcode(report.getId());;
 			}
 		} catch (Exception e) {
 			// TODO: handle exception