1

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

@@ -3,13 +3,11 @@ package com.zskk.config;
 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.OracleDialect;
 import com.jfinal.plugin.cron4j.Cron4jPlugin;
 import com.jfinal.plugin.druid.DruidPlugin;
 import com.jfinal.template.Engine;
 import com.zskk.control.ViewController;
-import com.zskk.model._MappingKit;
 import com.zskk.service.ServiceFactory;
 import com.zskk.task.DataTask;
 
@@ -53,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

@@ -54,10 +54,17 @@ public class DataTask implements ITask {
 			for (Exams exams2 : exams) {
 				try {
 					// 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")));*/
@@ -65,6 +72,73 @@ public class DataTask implements ITask {
 							|| record.getStr("IMPRESSION").isBlank() || record.getStr("DESCRIPTION").isBlank()) {
 						continue;
 					}
+					Map<String, String> params = new HashMap<>();
+					//exams表
+					params.put("exam_id",exams2.getId());
+					//报告医生姓名
+					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("PATIENTNAME")==null){
+						params.put("application_department","");
+					}else {
+						params.put("application_department",record.getStr("PATIENTNAME"));
+					}
+					//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("DIAGNOISI")==null){
+						params.put("clin_diag","");
+					}else {
+						params.put("clin_diag",record.getStr("DIAGNOISI"));
+					}
+
+					//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 logs = posturl(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());
@@ -107,9 +181,9 @@ public class DataTask implements ITask {
 					// 手机号
 					data.put("phone", "");
 					// 患者生日
-					data.put("birthday", patientInfos.getBirthday());
+					data.put("birthday", record.getStr("BIRTHDATE"));
 					// 患者检查时年龄
-					data.put("patient_age", patientInfos.getAge());
+					data.put("patient_age", record.getStr("PATIENTAGE"));
 					// 阴阳性 1阴性 2阳性
 					data.put("report_result", "");
 					// 报告时间 10位时间戳