互认

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

@@ -20,7 +20,9 @@ import com.zskk.service.ServiceFactory;
 import com.zskk.task.BindTask;
 import com.zskk.task.CheckTask;
 import com.zskk.task.DataTask;
+import com.zskk.task.JCBGTask;
 import com.zskk.task.JCTask;
+import com.zskk.task.JYTask;
 import com.zskk.task.PrintNumTask;
 import com.zskk.task.PrintTask;
 import com.zskk.task.UpdateTask;
@@ -101,16 +103,16 @@ public class ZskkConfig extends JFinalConfig {
 		Cron4jPlugin upData = new Cron4jPlugin();
 		upData.addTask("*/5 * * * *", new JCTask());
 		me.add(upData);
-//		
-//		//更新患者信息
-//		Cron4jPlugin pifData = new Cron4jPlugin();
-//		pifData.addTask("*/1 * * * *", new UpdateTask());
-//		me.add(pifData);
-//		
-//		//更新患者付费信息至PACS
-//	    Cron4jPlugin bdData = new Cron4jPlugin();
-//	    bdData.addTask("*/10 * * * *", new BindTask());
-//		me.add(bdData);
+		
+		//上传检查报告
+		Cron4jPlugin pifData = new Cron4jPlugin();
+		pifData.addTask("*/7 * * * *", new JCBGTask());
+		me.add(pifData);
+		
+		//上传检验信息
+	    Cron4jPlugin bdData = new Cron4jPlugin();
+	    bdData.addTask("*/9 * * * *", new JYTask());
+		me.add(bdData);
 //		
 //		//将打印png上传云端
 //	    Cron4jPlugin prData = new Cron4jPlugin();

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

@@ -12,6 +12,7 @@ import java.text.SimpleDateFormat;
 import java.util.Base64;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.bouncycastle.crypto.CryptoException;
@@ -23,6 +24,7 @@ import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.model.PutObjectResult;
 import com.jfinal.kit.PropKit;
+import com.jfinal.plugin.activerecord.Record;
 import com.zskk.tools.SM4Utils;
 
 import okhttp3.FormBody;
@@ -49,6 +51,11 @@ public class DataService {
 	private static String SAVE_PRINT_URL = "https://risserver3.pacsonline.cn/butt/savePrint";
 
 	private static String SAVE_EXAMINFO_URL = "http://10.200.199.136:9605/api/postExamInfo";
+	
+	private static String SAVE_EXAMREPORT_URL = "http://10.200.199.136:9605/api/postExamReport";
+	
+	private static String SAVE_LABREPORT_URL = "http://10.200.199.136:9605/api/postLabReport";
+
 //	private static String SAVE_EXAMINFO_URL = "http://111.53.165.106:9605/api/postExamInfo";
 
 
@@ -148,7 +155,7 @@ public class DataService {
 	 * @param instutionId
 	 * @param number
 	 */
-	public String postExamInfo(com.jfinal.plugin.activerecord.Record record) {
+	public String postExamInfo(Record record) {
 		Map<String, String> params = new HashMap<>();
 		params.put("request_time", "1");
 		params.put("request_no", "2");
@@ -214,8 +221,151 @@ public class DataService {
 		return content;
 
 	}
+	
+	/**
+	 * 互认-检查报告信息
+	 * 
+	 * @param instutionId
+	 * @param number
+	 */
+	public String postExamReport(Record record) {
+		Map<String, String> params = new HashMap<>();
+		params.put("request_time", "1");
+		params.put("request_no", "3");
+		
+		JSONObject jsonObject = new JSONObject();
 
+		JSONObject jsonObjectB = new JSONObject();
+		
+		jsonObjectB.put("BD", checkStr(record.getStr("检查号")));
+		jsonObjectB.put("BJ", "121403004061412685");
+		jsonObjectB.put("BK", "阳泉市第一人民医院");
+
+		JSONObject jsonObjectC = new JSONObject();
+		jsonObjectC.put("CA", checkStr(record.getStr("报告单编号")));
+		jsonObjectC.put("CB", checkStr(record.getStr("检查类型")));
+		jsonObjectC.put("CC", checkStr(record.getStr("检查部位")));
+		jsonObjectC.put("CD", checkStr(record.getStr("检查所见")));
+		jsonObjectC.put("CE", checkStr(record.getStr("影像诊断")));
+		jsonObjectC.put("CF", checkStr(record.getStr("检查结果类别")));
+		jsonObjectC.put("CG", checkStr(record.getStr("报告科室名称")));
+		jsonObjectC.put("CH", checkStr(record.getStr("报告医生姓名")));
+		jsonObjectC.put("CI", checkStr(record.getStr("审核医生姓名")));
+		jsonObjectC.put("CJ", checkStr(record.getStr("报告时间")));
+		jsonObjectC.put("CK", checkStr(record.getStr("审核时间")));
+		jsonObjectC.put("CL", checkStr(record.getStr("检查时间")));
+		jsonObjectC.put("CM", checkStr(record.getStr("危急值")));
+		jsonObjectC.put("CN", checkStr(record.getStr("报告医生编码")));
+		jsonObjectC.put("CO", checkStr(record.getStr("审核医生编码")));
+		jsonObjectC.put("CP", checkStr(record.getStr("患者编号")));
+		jsonObjectC.put("CQ", checkStr(record.getStr("报告单")));
+		jsonObjectC.put("CR", checkStr(record.getStr("检查状态")));
+
+		jsonObject.put("B", jsonObjectB);
+		jsonObject.put("C", jsonObjectC);
+		try {
+	        String encodedString = Base64.getEncoder().encodeToString(jsonObject.toJSONString().getBytes());
+
+			params.put("data", SM4Utils.sm4Encrypt("zLxapoeqWYpoeqWY",encodedString));
+		} catch (CryptoException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		String content = postWithParameters(SAVE_EXAMREPORT_URL, params);
+		return content;
+
+	}
 	
+	/**
+	 * 互认-检验报告信息
+	 * 
+	 * @param instutionId
+	 * @param number
+	 */
+	public String postLabReport(Record record, List<Record> items) {
+		Map<String, String> params = new HashMap<>();
+		params.put("request_time", "1");
+		params.put("request_no", "4");
+		
+		JSONObject jsonObject = new JSONObject();
+		
+		JSONObject jsonObjectA = new JSONObject();
+		jsonObjectA.put("AA", checkStr(record.getStr("姓名")));
+		jsonObjectA.put("AB", checkStr(record.getStr("证件类型编码")));
+		jsonObjectA.put("AC", checkStr(record.getStr("证件号码")));
+		jsonObjectA.put("AD", checkStr(record.getStr("性别编码")));
+		jsonObjectA.put("AE", checkStr(record.getStr("出生日期")));
+		jsonObjectA.put("AF", checkStr(record.getStr("联系电话")));
+		jsonObjectA.put("AG", checkStr(record.getStr("电子健康卡号")));
+
+		JSONObject jsonObjectB = new JSONObject();
+		jsonObjectB.put("BA", checkStr(record.getStr("就诊类型编码")));
+		jsonObjectB.put("BB", checkStr(record.getStr("就诊卡号")));
+		jsonObjectB.put("BC", checkStr(record.getStr("患者编号")));
+		jsonObjectB.put("BD", checkStr(record.getStr("就诊时间")));
+		jsonObjectB.put("BE", checkStr(record.getStr("就诊科室名称")));
+		jsonObjectB.put("BF", checkStr(record.getStr("申请医师名称")));
+		jsonObjectB.put("BG", checkStr(record.getStr("申请医生编码")));
+		jsonObjectB.put("BH", checkStr(record.getStr("主诉")));
+		jsonObjectB.put("BI", checkStr(record.getStr("年龄")));
+		jsonObjectB.put("BJ", "121403004061412685");
+		jsonObjectB.put("BK", "阳泉市第一人民医院");
+		jsonObjectB.put("BL", checkStr(record.getStr("临床诊断名称")));
+		jsonObjectB.put("BM", checkStr(record.getStr("临床诊断代码")));
+
+		JSONObject jsonObjectC = new JSONObject();
+		jsonObjectC.put("CA", checkStr(record.getStr("报告单编号")));
+		jsonObjectC.put("CB", checkStr(record.getStr("标本类型")));
+		jsonObjectC.put("CC", checkStr(record.getStr("检验项目名称")));
+		jsonObjectC.put("CD", checkStr(record.getStr("检测项目类型")));
+		jsonObjectC.put("CE", checkStr(record.getStr("报告医生姓名")));
+		jsonObjectC.put("CF", checkStr(record.getStr("报告医生编码")));
+		jsonObjectC.put("CG", checkStr(record.getStr("审核医师姓名")));
+		jsonObjectC.put("CH", checkStr(record.getStr("审核医师编码")));
+		jsonObjectC.put("CI", checkStr(record.getStr("报告科室名称")));
+		jsonObjectC.put("CJ", checkStr(record.getStr("报告评语")));
+		jsonObjectC.put("CK", checkStr(record.getStr("报告时间")));
+		jsonObjectC.put("CL", checkStr(record.getStr("互认项目编码")));
+		jsonObjectC.put("CM", checkStr(record.getStr("互认项目名称")));
+		jsonObjectC.put("CN", checkStr(record.getStr("报告单")));
+				
+		JSONArray jsonArrayD = new JSONArray();
+		for (Record itemrecord : items) {
+			JSONObject jsonObjectE = new JSONObject();
+			jsonObjectE.put("EA", checkStr(itemrecord.getStr("检验细项名称中文")));
+			jsonObjectE.put("EB", checkStr(itemrecord.getStr("检验细项缩写")));
+			jsonObjectE.put("EC", checkStr(itemrecord.getStr("检验细项序号")));
+			jsonObjectE.put("ED", checkStr(itemrecord.getStr("检验细项测量值")));
+			jsonObjectE.put("EE", checkStr(itemrecord.getStr("检验细项结果计量单位")));
+			jsonObjectE.put("EF", checkStr(itemrecord.getStr("检验细项结果")));
+			jsonObjectE.put("EG", checkStr(itemrecord.getStr("药敏结果")));
+			jsonObjectE.put("EH", checkStr(itemrecord.getStr("参考范围")));
+			jsonObjectE.put("EI", checkStr(itemrecord.getStr("检测方法")));
+			jsonObjectE.put("EJ", checkStr(itemrecord.getStr("KB")));
+			jsonObjectE.put("EK", checkStr(itemrecord.getStr("MIC")));
+			jsonObjectE.put("EL", checkStr(itemrecord.getStr("敏感度")));
+			jsonObjectE.put("EM", checkStr(itemrecord.getStr("互认项目编码")));
+			jsonObjectE.put("EN", checkStr(itemrecord.getStr("互认项目名称")));
+			jsonArrayD.add(jsonObjectE);
+		}
+		jsonObject.put("A", jsonObjectA);
+		jsonObject.put("B", jsonObjectB);
+		jsonObject.put("C", jsonObjectC);
+		jsonObject.put("D", jsonArrayD);
+		try {
+	        String encodedString = Base64.getEncoder().encodeToString(jsonObject.toJSONString().getBytes());
+
+			params.put("data", SM4Utils.sm4Encrypt("zLxapoeqWYpoeqWY",encodedString));
+		} catch (CryptoException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		String content = postWithParameters(SAVE_LABREPORT_URL, params);
+		return content;
+
+	}
 	
 	/**
 	 * 校验字符串
@@ -412,7 +562,7 @@ public class DataService {
 //		map.put("institution_id", "06300006");
 //		map.put("start", "2022-02-01");
 //		map.put("finish", "2022-03-01");
-//		String content = postExamInfo(null);
+//		String content = postExamReport(null);
 //		System.out.println(content);
 		
 

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

@@ -4,6 +4,7 @@ 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.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -21,77 +22,12 @@ public class JCBGTask implements ITask {
 	@Override
 	public void run() {
 		// TODO Auto-generated method stub
-		DataService dService = ServiceFactory.getService(DataService.class);
-        JSONArray jsonArray = dService.getExamList(200);	
-        for (Object object : jsonArray) {
-        	try {
-			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record1 = Db.use("connected").findFirst("select * from V_EXAM_INFO where 检查号=? and 检查状态=4", jsonObject.getString("patient_num"));
-			if (record1 == null) {
-				continue;
-			}
-			Record record2 = Db.use("connected").findFirst("select * from V_EXAM_REPORT where 检查号=?", jsonObject.getString("patient_num"));
+				DataService dService = ServiceFactory.getService(DataService.class);
 
-//			if (parseStringToDate(record.getStr("checktime"))==Boolean.FALSE) {
-//				continue;
-//			}
-			if (record2.getStr("检查所见").isBlank() || record2.getStr("影像诊断").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", PropKit.get("institution_id"));
-
-			params.put("code", jsonObject.getString("id"));
-			//报告医生姓名
-			params.put("report_doctor_name", record2.getStr("报告医生姓名"));
-			//报告时间
-			params.put("report_datetime", record2.getStr("报告时间"));
-			//审核医生姓名
-			params.put("review_doctor_name", record2.getStr("审核医生姓名")==null?"":record2.getStr("审核医生姓名"));
-			//审核时间
-			params.put("review_datetime", record2.getStr("审核时间"));
-			//确认医生姓名
-			params.put("confirm_doctor_name", record2.getStr("审核医生姓名")==null?"":record2.getStr("审核医生姓名"));
-			//确认时间
-			params.put("confirm_datetime", record2.getStr("审核时间"));
-			//意见建议
-			params.put("impression", record2.getStr("影像诊断"));
-			//影像所见
-			params.put("description", record2.getStr("检查所见"));
-			//exams表
-			//申请科室
-			params.put("application_department", record1.getStr("就诊科室名称")==null?"":record1.getStr("就诊科室名称"));
-			//申请医生
-			params.put("application_doctor", record1.getStr("申请医师名称")==null?"":record1.getStr("申请医师名称"));
-			//临床诊断
-			params.put("clin_diag", "");
-			//症状
-			params.put("clin_symp", record1.getStr("主诉")==null?"":record1.getStr("主诉"));
-			//patient_infos表
-			//患者姓名
-			params.put("name", record1.getStr("姓名"));
-			//患者手机号
-			params.put("phone", record1.getStr("联系电话")==null?"":record1.getStr("联系电话"));
-			//患者身份证号
-			params.put("card_num", record1.getStr("证件号码")==null?"":record1.getStr("证件号码"));
-			//检查结果1阴2阳
-			params.put("report_result", "0");
-			//门诊号住院号
-			params.put("hopitalized_no", "");
-			params.put("exam_project", record1.getStr("标本部位") == null ? "" : record1.getStr("标本部位"));
-//			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;
-			}
-        }
+				List<Record> records = Db.use("connected").find("select * from V_EXAM_REPORT where 最后更新时间 > ?",parseStringToDate1());
+				for (Record record : records) {
+					dService.postExamReport(record);
+				}
 	}
 
 	@Override
@@ -105,23 +41,15 @@ public class JCBGTask implements ITask {
 	 * @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("yyyyMMdd");
-
-			timeString = sdf2.format(date);
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-        return timeString;
-	}
+    private Date parseStringToDate1() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = new Date();
+        String timeString = null;
+        Long i = date.getTime();
+        Long j = i - 600000;
+        Date newdate = new Date(j);
+//      timeString = sdf.format(newdate);
+        return newdate;
+}
 
 }

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

@@ -4,6 +4,7 @@ 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.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -22,76 +23,13 @@ public class JYTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-        JSONArray jsonArray = dService.getExamList(200);	
-        for (Object object : jsonArray) {
-        	try {
-			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record1 = Db.use("connected").findFirst("select * from V_EXAM_INFO where 检查号=? and 检查状态=4", jsonObject.getString("patient_num"));
-			if (record1 == null) {
-				continue;
-			}
-			Record record2 = Db.use("connected").findFirst("select * from V_EXAM_REPORT where 检查号=?", jsonObject.getString("patient_num"));
 
-//			if (parseStringToDate(record.getStr("checktime"))==Boolean.FALSE) {
-//				continue;
-//			}
-			if (record2.getStr("检查所见").isBlank() || record2.getStr("影像诊断").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", PropKit.get("institution_id"));
+		List<Record> records = Db.use("connected").find("select * from V_LAB_REPORT where 最后更新时间 > ?",parseStringToDate1());
+		for (Record record : records) {
+			List<Record> itemrecords = Db.use("connected").find("select * from V_LAB_ITEM where 报告单编号 = ?",record.getStr("报告单编号"));
+			dService.postLabReport(record,itemrecords);
+		}
 
-			params.put("code", jsonObject.getString("id"));
-			//报告医生姓名
-			params.put("report_doctor_name", record2.getStr("报告医生姓名"));
-			//报告时间
-			params.put("report_datetime", record2.getStr("报告时间"));
-			//审核医生姓名
-			params.put("review_doctor_name", record2.getStr("审核医生姓名")==null?"":record2.getStr("审核医生姓名"));
-			//审核时间
-			params.put("review_datetime", record2.getStr("审核时间"));
-			//确认医生姓名
-			params.put("confirm_doctor_name", record2.getStr("审核医生姓名")==null?"":record2.getStr("审核医生姓名"));
-			//确认时间
-			params.put("confirm_datetime", record2.getStr("审核时间"));
-			//意见建议
-			params.put("impression", record2.getStr("影像诊断"));
-			//影像所见
-			params.put("description", record2.getStr("检查所见"));
-			//exams表
-			//申请科室
-			params.put("application_department", record1.getStr("就诊科室名称")==null?"":record1.getStr("就诊科室名称"));
-			//申请医生
-			params.put("application_doctor", record1.getStr("申请医师名称")==null?"":record1.getStr("申请医师名称"));
-			//临床诊断
-			params.put("clin_diag", "");
-			//症状
-			params.put("clin_symp", record1.getStr("主诉")==null?"":record1.getStr("主诉"));
-			//patient_infos表
-			//患者姓名
-			params.put("name", record1.getStr("姓名"));
-			//患者手机号
-			params.put("phone", record1.getStr("联系电话")==null?"":record1.getStr("联系电话"));
-			//患者身份证号
-			params.put("card_num", record1.getStr("证件号码")==null?"":record1.getStr("证件号码"));
-			//检查结果1阴2阳
-			params.put("report_result", "0");
-			//门诊号住院号
-			params.put("hopitalized_no", "");
-			params.put("exam_project", record1.getStr("标本部位") == null ? "" : record1.getStr("标本部位"));
-//			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
@@ -105,23 +43,15 @@ public class JYTask implements ITask {
 	 * @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("yyyyMMdd");
-
-			timeString = sdf2.format(date);
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-        return timeString;
-	}
+    private Date parseStringToDate1() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = new Date();
+        String timeString = null;
+        Long i = date.getTime();
+        Long j = i - 600000;
+        Date newdate = new Date(j);
+//      timeString = sdf.format(newdate);
+        return newdate;
+}
 
 }