三家医院合并同个程序

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

@@ -18,6 +18,8 @@ import com.jfinal.template.Engine;
 import com.zskk.control.ViewController;
 import com.zskk.service.ServiceFactory;
 import com.zskk.task.DataTask;
+import com.zskk.task.HaojiTask;
+import com.zskk.task.SanyuanTask;
 
 public class ZskkConfig extends JFinalConfig {
 
@@ -75,6 +77,14 @@ public class ZskkConfig extends JFinalConfig {
 		Cron4jPlugin cpData = new Cron4jPlugin();
 		cpData.addTask("*/5 * * * *", new DataTask());
 		me.add(cpData);
+		
+		Cron4jPlugin syData = new Cron4jPlugin();
+		syData.addTask("*/6 * * * *", new SanyuanTask());
+		me.add(syData);
+		
+		Cron4jPlugin hjData = new Cron4jPlugin();
+		hjData.addTask("*/7 * * * *", new HaojiTask());
+		me.add(hjData);
 	}
 
 	@Override

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

@@ -72,7 +72,7 @@ public class ViewController extends Controller {
 	public void sdtb() {
 		try {
 			DataService dService = ServiceFactory.getService(DataService.class);
-	        JSONArray jsonArray = dService.getExamList(50);	
+	        JSONArray jsonArray = dService.getExamList(50,this.getPara("insid"));	
 	        for (Object object : jsonArray) {
 	        	try {
 				JSONObject jsonObject = JSON.parseObject(object.toString());
@@ -87,7 +87,7 @@ public class ViewController extends Controller {
 				//1:exam_id 2:patient_num 3:accession_num 4:study_uid
 				params.put("type", "1");
 				
-				params.put("institution_id", PropKit.get("institution_id"));
+				params.put("institution_id", this.getPara("insid"));
 
 				params.put("code", jsonObject.getString("id"));
 				//报告医生姓名

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

@@ -36,9 +36,9 @@ public class DataService {
      * @param instutionId
      * @param number
      */
-    public JSONArray getExamList(Integer number) {
+    public JSONArray getExamList(Integer number,String institution_id) {
     	Map <String,String> map = new HashMap<String,String>();
-    	map.put("institution_id", PropKit.get("institution_id"));
+    	map.put("institution_id", institution_id);
     	map.put("num", number.toString());
 		String content = postWithParameters(GET_EXAM_URL, map);
 	    JSONObject jsonObject = JSON.parseObject(content);

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

@@ -22,7 +22,7 @@ public class DataTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-        JSONArray jsonArray = dService.getExamList(50);	
+        JSONArray jsonArray = dService.getExamList(50,PropKit.get("institution_id"));	
         for (Object object : jsonArray) {
         	try {
 			JSONObject jsonObject = JSON.parseObject(object.toString());

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

@@ -0,0 +1,127 @@
+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.kit.PropKit;
+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 HaojiTask implements ITask {
+
+	@Override
+	public void run() {
+		// TODO Auto-generated method stub
+		DataService dService = ServiceFactory.getService(DataService.class);
+        JSONArray jsonArray = dService.getExamList(50,"25200013");	
+        for (Object object : jsonArray) {
+        	try {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			Record record = Db.use("connected").findFirst("select * from reportinfo where studyuid=?", jsonObject.getString("studyuid"));
+			if (record == null) {
+				continue;
+			}
+			if (record.getStr("impression").isBlank() && record.getStr("description").isBlank()) {
+				continue;
+			}
+			Map<String, String> params = new HashMap<>();
+			//1:exam_id 2:patient_num 3:accession_num 4:study_uid
+			params.put("type", "1");
+			
+			params.put("institution_id", "25200013");
+
+			params.put("code", jsonObject.getString("id"));
+			//报告医生姓名
+			params.put("report_doctor_name", record.getStr("reportdoctor"));
+			//报告时间
+			params.put("report_datetime", record.getStr("reportdate"));
+			//审核医生姓名
+			params.put("review_doctor_name", record.getStr("reviewdoctor")==null?"":record.getStr("reviewdoctor"));
+			//审核时间
+			params.put("review_datetime", record.getStr("reportdate"));
+			//确认医生姓名
+			params.put("confirm_doctor_name", record.getStr("reviewdoctor")==null?"":record.getStr("reviewdoctor"));
+			//确认时间
+			params.put("confirm_datetime", record.getStr("reportdate"));
+			//意见建议
+			params.put("impression", record.getStr("impression"));
+			//影像所见
+			params.put("description", record.getStr("description"));
+			//exams表
+			//申请科室
+			params.put("application_department", record.getStr("department"));
+			//申请医生
+			params.put("application_doctor", record.getStr("clinicaldoctor"));
+			//临床诊断
+			params.put("clin_diag", "");
+			//症状
+			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"));
+			//检查结果1阴2阳
+			params.put("report_result", record.getStr("result").contains("阳")?"2":"1");
+			//住院号
+//			params.put("hopitalized_no", record.getStr("patientNumber"));
+			//门诊号
+//			params.put("out_patient", record.getStr("patientNumber"));
+			//病人ID
+			params.put("his_patient_id", record.getStr("accessionNumber"));
+			//检查方法
+//			params.put("exam_project", record.getStr("patientNumber"));
+
+			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+			tService.execute(() -> {
+				dService.saveReport(params);
+			});	
+        	} catch (Exception e) {
+				// TODO: handle exception
+        		continue;
+			}
+        }
+	}
+
+	@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

@@ -1,127 +0,0 @@
-package com.zskk.task;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.jfinal.kit.PropKit;
-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 ReviewTask implements ITask {
-
-	@Override
-	public void run() {
-		// TODO Auto-generated method stub
-		DataService dService = ServiceFactory.getService(DataService.class);
-		List<Record> records = Db.use("connected").find("select top 50 * from reportcheck order by checktime desc");
-		for (Record record : records) {
-			try {
-				if (record == null) {
-					continue;
-				}
-				if (record.getStr("impression").isBlank() || record.getStr("description").isBlank()) {
-					continue;
-				}
-				Map<String, String> params = new HashMap<>();
-				// 1:exam_id 2:patient_num 3:accession_num 4:study_uid
-				params.put("type", "4");
-
-				params.put("institution_id", PropKit.get("institution_id"));
-
-				params.put("code", record.getStr("studyuid"));
-				// 报告医生姓名
-				params.put("report_doctor_name", record.getStr("reportdoctor"));
-				// 报告时间
-				params.put("report_datetime", record.getStr("reportdate"));
-				// 审核医生姓名
-				params.put("review_doctor_name",
-						record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor"));
-				// 审核时间
-				params.put("review_datetime", record.getStr("reportdate"));
-				// 确认医生姓名
-				params.put("confirm_doctor_name",
-						record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor"));
-				// 确认时间
-				params.put("confirm_datetime", record.getStr("reportdate"));
-				// 意见建议
-				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",
-						record.getStr("clinicaldoctor") == null ? "" : record.getStr("clinicaldoctor"));
-				// 临床诊断
-				params.put("clin_diag", record.getStr("diagnosis") == null ? "" : record.getStr("diagnosis"));
-				// 症状
-				params.put("clin_symp", record.getStr("symptom") == null ? "" : record.getStr("symptom"));
-				// 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", "0");
-				// 门诊号住院号
-				params.put("hopitalized_no", "");
-				params.put("exam_project",
-						record.getStr("JianchaMingcheng") == null ? "" : record.getStr("JianchaMingcheng"));
-				params.put("exam_method", record.getStr("JianchaFangfa") == null ? "" : record.getStr("JianchaFangfa"));
-				ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
-				tService.execute(() -> {
-					dService.saveReport(params);
-				});
-
-			} catch (Exception e) {
-				// TODO: handle exception
-				continue;
-			}
-
-		}
-
-	}
-
-	@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/SanyuanTask.java

@@ -0,0 +1,127 @@
+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.kit.PropKit;
+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 SanyuanTask implements ITask {
+
+	@Override
+	public void run() {
+		// TODO Auto-generated method stub
+		DataService dService = ServiceFactory.getService(DataService.class);
+        JSONArray jsonArray = dService.getExamList(50,"25200017");	
+        for (Object object : jsonArray) {
+        	try {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			Record record = Db.use("connected").findFirst("select * from reportinfo where studyuid=?", jsonObject.getString("studyuid"));
+			if (record == null) {
+				continue;
+			}
+			if (record.getStr("impression").isBlank() && record.getStr("description").isBlank()) {
+				continue;
+			}
+			Map<String, String> params = new HashMap<>();
+			//1:exam_id 2:patient_num 3:accession_num 4:study_uid
+			params.put("type", "1");
+			
+			params.put("institution_id", "25200017");
+
+			params.put("code", jsonObject.getString("id"));
+			//报告医生姓名
+			params.put("report_doctor_name", record.getStr("reportdoctor"));
+			//报告时间
+			params.put("report_datetime", record.getStr("reportdate"));
+			//审核医生姓名
+			params.put("review_doctor_name", record.getStr("reviewdoctor")==null?"":record.getStr("reviewdoctor"));
+			//审核时间
+			params.put("review_datetime", record.getStr("reportdate"));
+			//确认医生姓名
+			params.put("confirm_doctor_name", record.getStr("reviewdoctor")==null?"":record.getStr("reviewdoctor"));
+			//确认时间
+			params.put("confirm_datetime", record.getStr("reportdate"));
+			//意见建议
+			params.put("impression", record.getStr("impression"));
+			//影像所见
+			params.put("description", record.getStr("description"));
+			//exams表
+			//申请科室
+			params.put("application_department", record.getStr("department"));
+			//申请医生
+			params.put("application_doctor", record.getStr("clinicaldoctor"));
+			//临床诊断
+			params.put("clin_diag", "");
+			//症状
+			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"));
+			//检查结果1阴2阳
+			params.put("report_result", record.getStr("result").contains("阳")?"2":"1");
+			//住院号
+//			params.put("hopitalized_no", record.getStr("patientNumber"));
+			//门诊号
+//			params.put("out_patient", record.getStr("patientNumber"));
+			//病人ID
+			params.put("his_patient_id", record.getStr("accessionNumber"));
+			//检查方法
+//			params.put("exam_project", record.getStr("patientNumber"));
+
+			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+			tService.execute(() -> {
+				dService.saveReport(params);
+			});	
+        	} catch (Exception e) {
+				// TODO: handle exception
+        		continue;
+			}
+        }
+	}
+
+	@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/UpdateTask.java

@@ -1,81 +0,0 @@
-package com.zskk.task;
-
-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 UpdateTask implements ITask {
-
-	@Override
-	public void run() {
-		// TODO Auto-generated method stub
-		DataService dService = ServiceFactory.getService(DataService.class);
-        JSONArray jsonArray = dService.getExamList(30);
-        for (Object object : jsonArray) {
-        	try {
-			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from examinfo where studyuid=?", jsonObject.getString("studyuid"));
-			if (record == null) {
-				continue;
-			}
-			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", record.getStr("clinicaldoctor") == null ? "" : record.getStr("clinicaldoctor"));
-			//临床诊断
-			params.put("clin_diag", record.getStr("diagnosis") == null ? "" : record.getStr("diagnosis"));
-			//症状
-			params.put("clin_symp", record.getStr("symptom") == null ? "" : record.getStr("symptom"));
-			//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"));
-			//门诊号住院号
-			params.put("hopitalized_no", "");
-			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
-			tService.execute(() -> {
-				dService.updatePatientInfo(params);
-			});	
-        	} catch (Exception e) {
-				// TODO: handle exception
-        		continue;
-			}
-        }
-	}
-
-	@Override
-	public void stop() {
-		// TODO Auto-generated method stub
-
-	}
-	
-	/**
-	 * 日期字符串格式转换
-	 * @param dateStr
-	 * @return
-	 */
-	private String parseStringToDate() {
-		SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-	    Date date = new Date();
-	    String timeString = sdf.format(date);
-	    return timeString;
-	}
-
-
-}