增加审核时间

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

@@ -19,8 +19,10 @@ import com.zskk.control.ViewController;
 import com.zskk.service.ServiceFactory;
 import com.zskk.task.CheckTask;
 import com.zskk.task.DataTask;
+import com.zskk.task.InfoTask;
 import com.zskk.task.InsertTask;
 import com.zskk.task.ReviewTask;
+import com.zskk.task.TempTask;
 import com.zskk.task.UpdateTask;
 
 public class ZskkConfig extends JFinalConfig {
@@ -118,6 +120,16 @@ public class ZskkConfig extends JFinalConfig {
 		Cron4jPlugin reData = new Cron4jPlugin();
 		reData.addTask("*/7 * * * *", new ReviewTask());
 		me.add(reData);
+		
+		// 匹配患者信息
+		Cron4jPlugin ifData = new Cron4jPlugin();
+		ifData.addTask("*/2 * * * *", new InfoTask());
+		me.add(ifData);
+
+		// 临时补传报告
+		Cron4jPlugin tData = new Cron4jPlugin();
+		tData.addTask("*/30 * * * *", new TempTask());
+		me.add(tData);
 	}
 
 	@Override

DataFusion/src/com/zskk/control/ViewController.java

@@ -127,7 +127,7 @@ public class ViewController extends Controller {
 	//报告匹配
 		public void sdtb() {
 			DataService dService = ServiceFactory.getService(DataService.class);
-			List<Record> records = Db.use("connected").find("SELECT *FROM zskk_reportinfo WHERE REPORTDATE >TO_DATE(?, 'YYYY-MM-DD HH24:MI:SS')AND REPORTDATE <= TO_DATE(?, 'YYYY-MM-DD HH24:MI:SS')",this.getPara("from"),this.getPara("to"));
+			List<Record> records = Db.use("connected").find("SELECT *FROM zskk_reportinfo WHERE REVIEWDATE >TO_DATE(?, 'YYYY-MM-DD HH24:MI:SS')AND REVIEWDATE <= TO_DATE(?, 'YYYY-MM-DD HH24:MI:SS')",this.getPara("from"),this.getPara("to"));
 			for (Record record : records) {
 				try {
 					if (record.getStr("IMPRESSION") == null && record.getStr("DESCRIPTION") == null) {
@@ -147,11 +147,11 @@ public class ViewController extends Controller {
 					//审核医生姓名
 					params.put("review_doctor_name", record.getStr("REVIEWDOCTOR"));
 					//审核时间
-					params.put("review_datetime", record.getStr("REPORTDATE"));
+					params.put("review_datetime", record.getStr("REVIEWDATE"));
 					//确认医生姓名
 					params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR"));
 					//确认时间
-					params.put("confirm_datetime", record.getStr("REPORTDATE"));
+					params.put("confirm_datetime", record.getStr("REVIEWDATE"));
 					//意见建议
 					params.put("impression", record.getStr("IMPRESSION"));
 					//影像所见

DataFusion/src/com/zskk/service/DataService.java

@@ -25,6 +25,8 @@ public class DataService {
 	private static String GET_EXAM_URL = "https://risserver3.pacsonline.cn/butt/getExam";
 
 	private static String SAVE_REPORT_URL = "https://risserver3.pacsonline.cn/butt/saveReport";
+	
+	private static String UPDATE_PATIENT_URL = "https://risserver3.pacsonline.cn/butt/saveExam";
 
 	private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient();
 
@@ -58,6 +60,16 @@ public class DataService {
 		postWithParameters(SAVE_REPORT_URL, map);
 
 	}
+	
+	/**
+	 * 更新患者信息  
+	 * 
+	 * @param instutionId
+	 * @param number
+	 */
+	public void updatePatientInfo(Map<String, String> map) {
+		postWithParameters(UPDATE_PATIENT_URL, map);
+	}
 
 	public static String postWithParameters(String url, Map<String, String> map) {
 

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

@@ -40,11 +40,11 @@ public class DataTask implements ITask {
 			//审核医生姓名
 			params.put("review_doctor_name", record.getStr("REVIEWDOCTOR"));
 			//审核时间
-			params.put("review_datetime", record.getStr("REPORTDATE"));
+			params.put("review_datetime", record.getStr("REVIEWDATE"));
 			//确认医生姓名
 			params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR"));
 			//确认时间
-			params.put("confirm_datetime", record.getStr("REPORTDATE"));
+			params.put("confirm_datetime", record.getStr("REVIEWDATE"));
 			//意见建议
 			params.put("impression", record.getStr("IMPRESSION"));
 			//影像所见

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

@@ -0,0 +1,86 @@
+package com.zskk.task;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jfinal.plugin.activerecord.Db;
+import com.jfinal.plugin.activerecord.Record;
+import com.jfinal.plugin.cron4j.ITask;
+import com.zskk.service.DataService;
+import com.zskk.service.ServiceFactory;
+import com.zskk.service.ThreadPoolService;
+
+public class InfoTask implements ITask {
+
+	@Override
+	public void run() {
+		// TODO Auto-generated method stub
+		DataService dService = ServiceFactory.getService(DataService.class);
+        JSONArray jsonArray = dService.getExamList(10);	
+        for (Object object : jsonArray) {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			Record record = Db.use("connected").findFirst("select * from zskk_examinfo where ACCESSIONNUMBER=?", jsonObject.getString("accession_num"));
+			Map<String, String> params = new HashMap<>();
+			params.put("exam_id", jsonObject.getString("id"));
+			//exams表
+			//申请科室
+			params.put("application_department", record.getStr("DEPARTMENT")==null?"":record.getStr("DEPARTMENT"));
+			//申请医生
+			params.put("application_doctor", "");
+			//临床诊断
+			params.put("clin_diag", record.getStr("DIAGNOSIS")==null?"":record.getStr("DIAGNOSIS"));
+			//症状
+			params.put("clin_symp", "");
+			//patient_infos表
+			//患者姓名
+			params.put("name", record.getStr("PATIENTNAME"));
+			//患者手机号
+			params.put("phone", record.getStr("PHONE")==null?"":record.getStr("PHONE"));
+			//患者身份证号
+			params.put("card_num", record.getStr("IDCARD")==null?"":record.getStr("IDCARD"));
+			//检查结果1阴2阳
+//			params.put("report_result", record.getStr("RESULT").equals("1")?"2":"1");
+			params.put("hopitalized_no", record.getStr("PATIENTID"));
+			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+			tService.execute(() -> {
+				dService.updatePatientInfo(params);
+			});	
+        }
+	}
+
+	@Override
+	public void stop() {
+		// TODO Auto-generated method stub
+
+	}
+	
+	/**
+	 * 日期字符串格式转换
+	 * @param dateStr
+	 * @return
+	 */
+	private String parseStringToDate(String dateStr) {
+		if (dateStr == null) {
+			return "";
+		}
+		SimpleDateFormat sdf= new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
+	    Date date = null;
+	    String timeString = null;
+		try {
+			date = sdf.parse(dateStr);
+			SimpleDateFormat sdf2= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+			timeString = sdf2.format(date);
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        return timeString;
+	}
+
+}

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

@@ -23,7 +23,7 @@ public class ReviewTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-		List<Record> records = Db.use("connected").find("SELECT *FROM (SELECT *FROM zskk_reportinfo ORDER BY REPORTDATE DESC)WHERE ROWNUM <= 20");
+		List<Record> records = Db.use("connected").find("SELECT *FROM (SELECT *FROM zskk_reportinfo ORDER BY REVIEWDATE DESC)WHERE ROWNUM <= 20");
 		for (Record record : records) {
 			try {
 				if (record.getStr("IMPRESSION") == null && record.getStr("DESCRIPTION") == null) {
@@ -43,11 +43,11 @@ public class ReviewTask implements ITask {
 				//审核医生姓名
 				params.put("review_doctor_name", record.getStr("REVIEWDOCTOR"));
 				//审核时间
-				params.put("review_datetime", record.getStr("REPORTDATE"));
+				params.put("review_datetime", record.getStr("REVIEWDATE"));
 				//确认医生姓名
 				params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR"));
 				//确认时间
-				params.put("confirm_datetime", record.getStr("REPORTDATE"));
+				params.put("confirm_datetime", record.getStr("REVIEWDATE"));
 				//意见建议
 				params.put("impression", record.getStr("IMPRESSION"));
 				//影像所见

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

@@ -0,0 +1,108 @@
+package com.zskk.task;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jfinal.plugin.activerecord.Db;
+import com.jfinal.plugin.activerecord.Record;
+import com.jfinal.plugin.cron4j.ITask;
+import com.zskk.service.DataService;
+import com.zskk.service.ServiceFactory;
+import com.zskk.service.ThreadPoolService;
+
+public class TempTask implements ITask {
+
+	@Override
+	public void run() {
+		// TODO Auto-generated method stub
+		DataService dService = ServiceFactory.getService(DataService.class);
+        JSONArray jsonArray = dService.getExamList(5500);	
+        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"));
+			if (record == null) {
+				continue;
+			}
+			if (record.getStr("IMPRESSION") == null && record.getStr("DESCRIPTION") == null) {
+				continue;
+			}
+			Map<String, String> params = new HashMap<>();
+			params.put("exam_id", jsonObject.getString("id"));
+			//报告医生姓名
+			params.put("report_doctor_name", record.getStr("REPORTDOCTER"));
+			//报告时间
+			params.put("report_datetime", record.getStr("REPORTDATE"));
+			//审核医生姓名
+			params.put("review_doctor_name", record.getStr("REVIEWDOCTOR"));
+			//审核时间
+			params.put("review_datetime", record.getStr("REVIEWDATE"));
+			//确认医生姓名
+			params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR"));
+			//确认时间
+			params.put("confirm_datetime", record.getStr("REVIEWDATE"));
+			//意见建议
+			params.put("impression", record.getStr("IMPRESSION"));
+			//影像所见
+			params.put("description", record.getStr("DESCRIPTION"));
+			//exams表
+			//申请科室
+			params.put("application_department", record.getStr("DEPARTMENT")==null?"":record.getStr("DEPARTMENT"));
+			//申请医生
+			params.put("application_doctor", "");
+			//临床诊断
+			params.put("clin_diag", record.getStr("DIAGNOSIS")==null?"":record.getStr("DIAGNOSIS"));
+			//症状
+			params.put("clin_symp", "");
+			//patient_infos表
+			//患者姓名
+			params.put("name", record.getStr("PATIENTNAME"));
+			//患者手机号
+			params.put("phone", record.getStr("PHONE")==null?"":record.getStr("PHONE"));
+			//患者身份证号
+			params.put("card_num", record.getStr("IDCARD")==null?"":record.getStr("IDCARD"));
+			//检查结果1阴2阳
+			params.put("report_result", record.getStr("RESULT").equals("1")?"2":"1");
+			params.put("hopitalized_no", record.getStr("PATIENTID"));
+			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+			tService.execute(() -> {
+				dService.saveReport(params);
+			});	
+        }
+	}
+
+	@Override
+	public void stop() {
+		// TODO Auto-generated method stub
+
+	}
+	
+	/**
+	 * 日期字符串格式转换
+	 * @param dateStr
+	 * @return
+	 */
+	private String parseStringToDate(String dateStr) {
+		if (dateStr == null) {
+			return "";
+		}
+		SimpleDateFormat sdf= new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
+	    Date date = null;
+	    String timeString = null;
+		try {
+			date = sdf.parse(dateStr);
+			SimpleDateFormat sdf2= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+			timeString = sdf2.format(date);
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        return timeString;
+	}
+
+}