commit

DataFusion/.classpath

@@ -25,5 +25,6 @@
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/okio-2.2.2.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/sqljdbc42.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jfinal-4.8-bin-with-src.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/aliyun-sdk-oss-3.10.2.jar"/>
 	<classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>
 </classpath>

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.PrintNumTask;
+import com.zskk.task.PrintTask;
 
 public class ZskkConfig extends JFinalConfig {
 
@@ -88,12 +90,12 @@ public class ZskkConfig extends JFinalConfig {
 		cpData.addTask("*/5 * * * *", new DataTask());
 		me.add(cpData);
 		
-		Cron4jPlugin pnData = new Cron4jPlugin();
-		pnData.addTask("*/5 * * * *", new DataTask());
-		me.add(pnData);
+//		Cron4jPlugin pnData = new Cron4jPlugin();
+//		pnData.addTask("0 */2 * * *", new PrintNumTask());
+//		me.add(pnData);
 		
 		Cron4jPlugin prData = new Cron4jPlugin();
-		prData.addTask("*/5 * * * *", new DataTask());
+		prData.addTask("*/5 * * * *", new PrintTask());
 		me.add(prData);
 	}
 

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

@@ -1,12 +1,20 @@
 package com.zskk.service;
 
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 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.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClientBuilder;
 import com.jfinal.kit.PropKit;
 
 import okhttp3.FormBody;
@@ -25,6 +33,10 @@ public class DataService {
     private static String UPDATE_PATIENT_URL = "https://risserver3.pacsonline.cn/butt/saveExam";
     
     private static String FEE_URL = "https://risserver3.pacsonline.cn/film/callback";
+    
+	private static String SAVE_ANNEX_URL = "https://risserver3.pacsonline.cn/butt/saveAnnex";
+	
+	private static String SAVE_PRINT_URL = "https://risserver3.pacsonline.cn/butt/savePrint";
 	
     private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient();
     
@@ -77,6 +89,94 @@ public class DataService {
     	postWithJson(FEE_URL, jsonObject);
     }
     
+	/**
+	 * 保存附件
+	 * 
+	 * @param instutionId
+	 * @param number
+	 * @throws FileNotFoundException 
+	 */
+	public void saveAnnex(Map<String, String> map, String filePath) {
+	    OSS OSS_CLIENT = new OSSClientBuilder().build(PropKit.get("oss_endpoint"), PropKit.get("oss_accessKey"), PropKit.get("oss_secretKey"));
+
+		String fileNameStr[] = filePath.split("/");
+		String fileName = fileNameStr[fileNameStr.length - 1];
+		String fileStorePath = getFileWithUrl(filePath, fileName);
+		File file = new File(fileStorePath);
+		String key = PropKit.get("institution_id") + "/" + fileName;
+        InputStream inputStream = null;
+		try {
+			inputStream = new FileInputStream(fileStorePath);
+		} catch (FileNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}            
+		Boolean eBoolean = OSS_CLIENT.doesObjectExist(PropKit.get("oss_bucketName"), key);
+		if (!eBoolean) {
+			OSS_CLIENT.putObject(PropKit.get("oss_bucketName"), key, inputStream);
+			Boolean bBoolean = OSS_CLIENT.doesObjectExist(PropKit.get("oss_bucketName"), key);
+			if (!bBoolean) {
+				OSS_CLIENT.putObject(PropKit.get("oss_bucketName"), key, inputStream);
+			}
+		}
+		map.put("url", "https://zskk-image.oss-cn-beijing.aliyuncs.com/" + key);
+		map.put("name", key);
+		postWithParameters(SAVE_ANNEX_URL, map);
+		try {
+			inputStream.close();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		file.delete();
+
+	}
+	
+	/**
+	 * 获取未出报告的检查列表
+	 * 
+	 * @param instutionId
+	 * @param number
+	 */
+	public void savePrint(Map<String, String> map) {
+		
+		String content = postWithParameters(SAVE_PRINT_URL, map);
+
+		
+	}
+	
+	public static String getFileWithUrl(String url, String filename) {
+
+		Request request = new Request.Builder().url(url).build();
+		try (Response response = OKHTTP_CLIENT.newCall(request).execute()) {
+			if (!response.isSuccessful())
+				throw new IOException("Unexpected code " + response);
+			InputStream inputStream = response.body().source().inputStream();
+			// 本地文件夹目录（下载位置）
+			String folder = PropKit.get("oss_localPath");
+			// 下载文件保存位置
+			String savepath = folder + "/" + filename;
+			BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(new FileOutputStream(new File(savepath)));
+			byte[] data = new byte[1024];
+			int len;
+			int available = inputStream.available();
+			while ((len = inputStream.read(data)) != -1) {
+				bufferedOutputStream.write(data, 0, len);
+			}
+			bufferedOutputStream.flush();
+			bufferedOutputStream.close();
+			inputStream.close();
+
+			return savepath;
+
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return "";
+
+		}
+	}
+    
     public static String postWithParameters(String url, Map<String, String> map) {
     	
     	FormBody.Builder formbody = new FormBody.Builder();

DataFusion/src/com/zskk/task/PrintNumTask.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 PrintNumTask implements ITask {
+
+	@Override
+	public void run() {
+		// TODO Auto-generated method stub
+		DataService dService = ServiceFactory.getService(DataService.class);
+        JSONArray jsonArray = dService.getExamList(50);	
+        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", PropKit.get("institution_id"));
+
+			params.put("code", jsonObject.getString("id"));
+			//报告医生姓名
+			params.put("report_doctor_name", record.getStr("reportdoctor"));
+			//报告时间
+			params.put("report_datetime", parseStringToDate(record.getStr("reportdate")));
+			//审核医生姓名
+			params.put("review_doctor_name", record.getStr("reviewdoctor")==null?"":record.getStr("reviewdoctor"));
+			//审核时间
+			params.put("review_datetime", parseStringToDate(record.getStr("reviewdate")));
+			//确认医生姓名
+			params.put("confirm_doctor_name", record.getStr("reviewdoctor")==null?"":record.getStr("reviewdoctor"));
+			//确认时间
+			params.put("confirm_datetime", parseStringToDate(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", 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", record.getStr("result").contains("1")?"2":"1");
+			//住院号
+			params.put("hopitalized_no", record.getStr("inPatientNum")==null?"":record.getStr("inPatientNum"));
+			//门诊号
+			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("exam_project", record.getStr("project")==null?"":record.getStr("project"));
+
+			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("yyyyMMdd");
+	    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/PrintTask.java

@@ -0,0 +1,95 @@
+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.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 PrintTask implements ITask {
+
+	@Override
+	public void run() {
+		// TODO Auto-generated method stub
+		DataService dService = ServiceFactory.getService(DataService.class);
+		List<Record> records = Db.use("print").find("select top 80 * from IMAGEVIEW where ADDTIME >? order by ADDTIME desc",parseStringToDate1());
+		for (Record record : records) {
+			try {
+				if (record == null) {
+					continue;
+				}
+				Map<String, String> annex_params = new HashMap<>();
+				annex_params.put("institution_id", PropKit.get("institution_id"));
+				annex_params.put("type", "3");
+				annex_params.put("code", record.getStr("CHECKID"));
+				//附件类型1.mp4 2.pdf 3.jpeg 4.png
+				annex_params.put("annex_class_code", "4");
+				annex_params.put("exam_datetime", parseStringToDate(record.getStr("ADDTIME")));
+	      		dService.saveAnnex(annex_params, record.getStr("IMGURL"));
+			} 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("yyyyMMdd");
+	    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;
+	}
+	
+	/**
+	 * 日期字符串格式转换
+	 * 
+	 * @param dateStr
+	 * @return
+	 */
+	private String 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 - 43200000;
+		Date newdate = new Date(j);
+		timeString = sdf.format(newdate);
+		return timeString;
+	}
+
+}