患者报告匹配

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

@@ -16,7 +16,6 @@ import com.jfinal.plugin.druid.DruidPlugin;
 import com.jfinal.template.Engine;
 import com.zskk.control.ViewController;
 import com.zskk.service.ServiceFactory;
-import com.zskk.task.CFindTask;
 import com.zskk.task.CMoveTask;
 import com.zskk.task.DataTask;
 import com.zskk.task.InfoTask;

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

@@ -1,44 +0,0 @@
-package com.zskk.task;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.jfinal.plugin.activerecord.Db;
-import com.jfinal.plugin.activerecord.Record;
-import com.jfinal.plugin.cron4j.ITask;
-import com.zskk.tools.ExecUtil;
-
-public class CFindTask implements ITask {
-
-	@Override
-	public void run() {
-		// TODO Auto-generated method stub
-		String dateString = parseStringToDate();
-		String fileString = dateString.replace("0", "o");
-		String execCmd = ExecUtil.execCmd("/zskk_system/other/cfind.sh " + dateString + " STUDYUID_" + fileString + ".xml");
-		if (execCmd.contains("Connection refused")) {
-			return;
-		}
-	}
-
-	@Override
-	public void stop() {
-		// TODO Auto-generated method stub
-
-	}
-	
-	/**
-	 * 日期字符串格式转换
-	 * 
-	 * @param dateStr
-	 * @return
-	 */
-	private String parseStringToDate() {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-		Date date = new Date();
-		long dInteger = date.getTime();
-		String daString = sdf.format(new Date(dInteger));
-		return daString;
-
-	}
-
-}

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

@@ -22,15 +22,15 @@ public class DataTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-        JSONArray jsonArray = dService.getExamList(400);	
+        JSONArray jsonArray = dService.getExamList(100);	
         for (Object object : jsonArray) {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from zskk_reportinfo where ACCESSIONNUMBER=?", jsonObject.getString("accession_num"));
+			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("DESCRIPTION") == null && record.getStr("REVIEWDOCTOR") == null) {
+			if (record.getStr("lmpression") == null && record.getStr("Description") == null && record.getStr("ReviewDoctor") == null) {
 				continue;
 			}
 			Map<String, String> params = new HashMap<>();
@@ -40,47 +40,47 @@ public class DataTask implements ITask {
 
 			params.put("code", jsonObject.getString("id"));
 			//报告医生姓名
-			params.put("report_doctor_name", record.getStr("REPORTDOCTER"));
+			params.put("report_doctor_name", record.getStr("ReportDoctor"));
 			//报告时间
-			params.put("report_datetime", record.getStr("REPORTDATE"));
+			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("lmpression"));
 			//影像所见
-			params.put("description", record.getStr("DESCRIPTION"));
+			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", "");
+			params.put("application_doctor", record.getStr("ReqDoctor")==null?"":record.getStr("ReqDoctor"));
 			//临床诊断
-			params.put("clin_diag", record.getStr("DIAGNOSIS")==null?"":record.getStr("DIAGNOSIS"));
+			params.put("clin_diag", record.getStr("Diagnosis")==null?"":record.getStr("Diagnosis"));
 			//症状
-			params.put("clin_symp", record.getStr("SYMPTOM")==null?"":record.getStr("SYMPTOM"));
+			params.put("clin_symp", record.getStr("Symptom")==null?"":record.getStr("Symptom"));
 			//patient_infos表
 			//患者姓名
-			params.put("name", record.getStr("PATIENTNAME"));
+			params.put("name", record.getStr("PatCName"));
 			//患者手机号
-			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("Result").contains("1")?"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("PROJECT")==null?"":record.getStr("PROJECT"));
+			params.put("exam_project", record.getStr("ExamItem")==null?"":record.getStr("ExamItem"));
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.saveReport(params);