浏览代码

http下载,患者信息匹配

LAPTOP-5NTQJPUS\LT 1 年之前
父节点
当前提交
e1b06a2a94

+ 4 - 4
DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -121,10 +121,10 @@ public class ZskkConfig extends JFinalConfig {
 		mvData.addTask("*/2 * * * *", new CMoveTask());
 		mvData.addTask("*/2 * * * *", new CMoveTask());
 		me.add(mvData);
 		me.add(mvData);
 		
 		
-//		//更新患者信息
-//		Cron4jPlugin ifData = new Cron4jPlugin();
-//		ifData.addTask("*/1 * * * *", new InfoTask());
-//		me.add(ifData);
+		//更新患者信息
+		Cron4jPlugin ifData = new Cron4jPlugin();
+		ifData.addTask("*/1 * * * *", new InfoTask());
+		me.add(ifData);
 //		
 //		
 //		//同步报告
 //		//同步报告
 //		Cron4jPlugin upData = new Cron4jPlugin();
 //		Cron4jPlugin upData = new Cron4jPlugin();

+ 11 - 38
DataFusion/src/com/zskk/service/DataService.java

@@ -47,6 +47,8 @@ public class DataService {
 	private static String GET_EXAM_URL = "https://risserver3.pacsonline.cn/butt/getExam";
 	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 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();
 	private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient();
 
 
@@ -81,6 +83,15 @@ public class DataService {
 
 
 	}
 	}
 
 
+	/**
+	    * 更新患者信息
+	    * 
+	    * @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) {
 	public static String postWithParameters(String url, Map<String, String> map) {
 
 
@@ -107,44 +118,6 @@ public class DataService {
 
 
 
 
 	public static void main(String[] args) {
 	public static void main(String[] args) {
-//    	Map <String,String> map = new HashMap<String,String>();
-//    	map.put("institution_id", "47600001");
-//    	map.put("num", "10");
-//		postWithParameters(GET_EXAM_URL, map);
-//		String fileName = "ss";
-//		Request request = new Request.Builder()
-//				.url("https://zskk-dcm.oss-cn-beijing.aliyuncs.com/73090001/d10378a36815fe3babd9b1e814b68fe6").build();
-//
-//		try (Response response = OKHTTP_CLIENT.newCall(request).execute()) {
-//			if (!response.isSuccessful())
-//				throw new IOException("Unexpected code " + response);
-//			String dirName = "/zskk_system/zskk_dicomQRScp/DICOM";
-//			File file = new File(dirName);
-//			if (!file.exists()) {
-//				file.mkdir();
-//			}
-//			if (response != null) {
-//				InputStream is = response.body().byteStream();
-//				FileOutputStream fos = new FileOutputStream(new File(dirName + "/" + fileName));
-//				int len = 0;
-//				byte[] buffer = new byte[2048];
-//				while (-1 != (len = is.read(buffer))) {
-//					fos.write(buffer, 0, len);
-//				}
-//				
-//				fos.flush();
-//				fos.close();
-//				is.close();
-//				File filen2 = new File(dirName + "/" + fileName);
-//				File filen = new File(dirName + "/" + fileName+".dcm");
-//				filen2.renameTo(filen);
-//			}
-//			
-//		} catch (IOException e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		}
-
 		SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 	    Date date = new Date();
 	    Date date = new Date();
 	    long dInteger =date.getTime()-65000;
 	    long dInteger =date.getTime()-65000;

+ 13 - 13
DataFusion/src/com/zskk/task/InfoTask.java

@@ -24,7 +24,7 @@ public class InfoTask implements ITask {
         JSONArray jsonArray = dService.getExamList(30);	
         JSONArray jsonArray = dService.getExamList(30);	
         for (Object object : jsonArray) {
         for (Object object : jsonArray) {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from examinfo where STUDYUID=?", jsonObject.getString("studyuid"));
+			Record record = Db.use("connected").findFirst("select * from examinfo where StudyInsUid=?", jsonObject.getString("studyuid"));
 			if (record == null) {
 			if (record == null) {
 				continue;
 				continue;
 			}
 			}
@@ -48,33 +48,33 @@ public class InfoTask implements ITask {
 			params.put("description", "");
 			params.put("description", "");
 			//exams表
 			//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", record.getStr("CLINICALDOCTOR")==null?"":record.getStr("CLINICALDOCTOR"));
+			params.put("application_doctor", record.getStr("ReqDoctor")==null?"":record.getStr("ReqDoctor"));
 			//临床诊断
 			//临床诊断
-			params.put("clin_diag", record.getStr("DIAGNOSE")==null?"":record.getStr("DIAGNOSE"));
+			params.put("clin_diag", record.getStr("Diagnosis")==null?"":record.getStr("Diagnosis"));
 			//症状
 			//症状
-			params.put("clin_symp", record.getStr("SYMPROM")==null?"":record.getStr("SYMPROM"));
+			params.put("clin_symp", record.getStr("Symptom")==null?"":record.getStr("Symptom"));
 			//patient_infos表
 			//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阳
 			//检查结果1阴2阳
 			params.put("report_result", "0");
 			params.put("report_result", "0");
 			//门诊号住院号
 			//门诊号住院号
-			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
 			//病人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("PROIECT")==null?"":record.getStr("PROIECT"));
+			params.put("exam_project", record.getStr("ExamItem")==null?"":record.getStr("ExamItem"));
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 			tService.execute(() -> {
-//				dService.updatePatientInfo(params);
+				dService.updatePatientInfo(params);
 			});	
 			});	
         }
         }
 	}
 	}