commit

DataFusion/res/config.properties

@@ -15,4 +15,4 @@ oss_endpoint       = https://oss-cn-beijing.aliyuncs.com
 oss_accessKey      = LTAI5tLyAFqdCs9qxxhHRFwG
 oss_secretKey      = I4ZZTINQPldFrujikkuJlDk9WS3eDw
 oss_bucketName     = zskk-image
-oss_localPath      = /home/lenove/JPG_FILE
+oss_localPath      = /home/lenovo/JPG_FILE

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

@@ -90,9 +90,9 @@ public class ZskkConfig extends JFinalConfig {
 		cpData.addTask("*/5 * * * *", new DataTask());
 		me.add(cpData);
 		
-//		Cron4jPlugin pnData = new Cron4jPlugin();
-//		pnData.addTask("0 */2 * * *", new PrintNumTask());
-//		me.add(pnData);
+		Cron4jPlugin pnData = new Cron4jPlugin();
+		pnData.addTask("0 */2 * * *", new PrintNumTask());
+		me.add(pnData);
 		
 		Cron4jPlugin prData = new Cron4jPlugin();
 		prData.addTask("*/5 * * * *", new PrintTask());

DataFusion/src/com/zskk/task/PrintNumTask.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,28 @@ public class PrintNumTask implements ITask {
 	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()) {
+		List<Record> records = Db.use("print").find("select * from IMAGEVIEW where PRINTED=? and PRINTTIME >?", "true", 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"));
+				annex_params.put("print_time", record.getStr("PRINTTIME"));
+	      		ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+				tService.execute(() -> {
+		      		dService.savePrint(annex_params);
+				});	
+			} catch (Exception e) {
+				// TODO: handle exception
 				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
@@ -123,5 +76,22 @@ public class PrintNumTask implements ITask {
 		}
         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 - 54000000;
+		Date newdate = new Date(j);
+		timeString = sdf.format(newdate);
+		return timeString;
+	}
 
 }