1

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

@@ -1,21 +1,14 @@
 package com.zskk.config;
 
-import com.jfinal.config.Constants;
-import com.jfinal.config.Handlers;
-import com.jfinal.config.Interceptors;
-import com.jfinal.config.JFinalConfig;
-import com.jfinal.config.Plugins;
-import com.jfinal.config.Routes;
+import com.jfinal.config.*;
 import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
-import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
 import com.jfinal.plugin.activerecord.dialect.SqlServerDialect;
 import com.jfinal.plugin.cron4j.Cron4jPlugin;
 import com.jfinal.plugin.druid.DruidPlugin;
 import com.jfinal.template.Engine;
-import com.zskk.service.ServiceFactory;
 import com.zskk.control.ViewController;
-import com.zskk.model._MappingKit;
+import com.zskk.service.ServiceFactory;
 import com.zskk.task.DataTask;
 
 public class ZskkConfig extends JFinalConfig {
@@ -58,16 +51,16 @@ public class ZskkConfig extends JFinalConfig {
 	@Override
 	public void configPlugin(Plugins me) {
 		// 配置数据库连接池插件
-		DruidPlugin druidPluginZskk = createZskkDruidPlugin();
-		me.add(druidPluginZskk);
+		//DruidPlugin druidPluginZskk = createZskkDruidPlugin();
+	//	me.add(druidPluginZskk);
 
 		// 配置ActiveRecord插件
-		ActiveRecordPlugin arpZskk = new ActiveRecordPlugin("zskk", druidPluginZskk);
-		arpZskk.setDialect(new MysqlDialect());
+		//ActiveRecordPlugin arpZskk = new ActiveRecordPlugin("zskk", druidPluginZskk);
+	//	arpZskk.setDialect(new MysqlDialect());
 
 		 //所有映射在 MappingKit 中自动化搞定
-		_MappingKit.mapping(arpZskk);
-		me.add(arpZskk);
+		//_MappingKit.mapping(arpZskk);
+		//me.add(arpZskk);
 
 		// 配置数据库连接池插件
 		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();

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

@@ -8,7 +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.Studies;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -16,6 +15,7 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.log4j.Logger;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -26,6 +26,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 public class DataTask implements ITask {
+	Logger logger = Logger.getLogger(UpdateTask.class);
 	private static String GET_EXAM_URL = "https://risserver3.pacsonline.cn/butt/getExam";
 
 	private static String SAVE_REPORT_URL = "https://risserver3.pacsonline.cn/butt/saveReport";
@@ -46,14 +47,21 @@ public class DataTask implements ITask {
 		// TODO Auto-generated method stub
 		try {
 			//List<Exams> exams = Exams.dao.use("zskk").find("SELECT * FROM pacsonline.exams where exam_status=3 and institution_id=33600001 order by createdAt desc limit 50");
-			JSONArray examList = getExamList("51000001", 5);
+			JSONArray examList = getExamList("33600001", 30);
 			List<Exams> exams = JSONObject.parseArray(examList.toJSONString(), Exams.class);
 			for (Exams exams2 : exams) {
 				//Studies studies = Studies.dao.use("zskk").findById(exams2.getStudyId());
-				Record record = Db.use("connected").findFirst("select * from reportinfo where studyuid=?",studies.getStudyuid());
+				Record record = Db.use("connected").findFirst("select * from reportinfo where studyuid=?",exams2.getStudyUid());
 				if (record == null) {
 					continue;
 				}
+				logger.info(record.getStr("reportdoctor")+"&"+record.getStr("reportdate")+"&");
+				logger.info(record.getStr("reviewdoctor")+"&"+record.getStr("reportdate")+"&");
+				//logger.info(record.getStr("REVIEWDOCTOR")+"&"+record.getStr("REPORTDATE")+"&");
+				logger.info(record.getStr("impression")+"&"+record.getStr("description")+"&");
+				logger.info(record.getStr("department")+"&"+record.getStr("clinicaldoctor")+"&");
+				logger.info(record.getStr("diagnosis")+"&"+record.getStr("patientname")+"&");
+				logger.info(record.getStr("phone")+"&"+record.getStr("idcard")+"&");
 				/*Report report = new Report().use("zskk");
 				report.setId(creatId());
 				report.setReportDatetime(parseStringToDate(record.getStr("reportdate")));*/
@@ -64,40 +72,70 @@ public class DataTask implements ITask {
 				//exams表
 				params.put("exam_id",exams2.getId());
 				//报告医生姓名
-				params.put("report_doctor_name","11");
-//            //报告时间
-				params.put("report_datetime","2018-05-08 15:13:19");
-//            //审核医生姓名
-				params.put("review_doctor_name","2");
-//            //审核时间
-				params.put("review_datetime","2018-05-08 15:13:19");
-//            //确认医生姓名
-				params.put("confirm_doctor_name","3");
-//            //确认时间
-				params.put("confirm_datetime","2018-05-08 15:13:19");
-////            if (record.getStr("impression") == null && record.getStr("description") == null) {
-////                continue;
-////            }
-//            //意见建议
-				params.put("impression","4");
-//            //影像所见
-				params.put("description","5");
-//            //exams表
-//            //申请科室
-				params.put("application_department","6");
-//            //申请医生
-				params.put("application_doctor","7");
-//            //临床诊断
-				params.put("clin_diag","8");
-//            //patient_infos表
-//            //患者姓名
-				params.put("name","9");
-//            //患者手机号
-				params.put("phone","10");
-//            //患者身份证号
-				params.put("card_num","11");
+				params.put("report_doctor_name",record.getStr("reportdoctor"));
+				//报告时间
+				params.put("report_datetime",record.getStr("reportdate"));
+				//审核医生姓名
+				params.put("review_doctor_name",record.getStr("reviewdoctor"));
+				//审核时间
+				params.put("review_datetime",record.getStr("reportdate"));
+				//确认医生姓名
+				params.put("confirm_doctor_name",record.getStr("reviewdoctor"));
+				//确认时间
+				params.put("confirm_datetime",record.getStr("reportdate"));
+				if (record.getStr("impression") == null && record.getStr("description") == null) {
+					continue;
+				}
+				//意见建议
+				params.put("impression",record.getStr("impression"));
+				//影像所见
+				params.put("description",record.getStr("description"));
+				//exams表
+				//申请科室
+				if (record.getStr("department")==null){
+					params.put("application_department","");
+				}else {
+					params.put("application_department",record.getStr("department"));
+				}
+				//params.put("application_department",record.getStr("department"));
+				//申请医生
+				if (record.getStr("clinicaldoctor")==null){
+					params.put("application_doctor","");
+				}else {
+					params.put("application_doctor",record.getStr("clinicaldoctor"));
+				}
+				//params.put("application_doctor",record.getStr("clinicaldoctor"));
+				//临床诊断
+				if (record.getStr("diagnosis")==null){
+					params.put("clin_diag","");
+				}else {
+					params.put("clin_diag",record.getStr("diagnosis"));
+				}
+
+				//patient_infos表
+				//患者姓名
+				params.put("name",record.getStr("patientname"));
+				//患者手机号
+				if (record.getStr("phone")==null){
+					params.put("phone","");
+				}else {
+					params.put("phone",record.getStr("phone"));
+				}
+
+				//params.put("phone","");
+				//患者身份证号
+				if (record.getStr("idcard")==null){
+					params.put("card_num","");
+				}else {
+					params.put("card_num",record.getStr("idcard"));
+				}
+				//params.put("card_num",);
 				params.put("report_result","1");
-				String post = post(SAVE_REPORT_URL, JSON.toJSONString(params));
+				String logs = post(SAVE_REPORT_URL, JSON.toJSONString(params));
+				String s = JSON.toJSONString(params);
+				logger.info(s);
+				logger.error(logs);
+
 				/*report.setImpression(record.getStr("impression"));
 				report.setDescription(record.getStr("description"));
 				report.setExamId(exams2.getId());