手动匹配历史报告

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

@@ -80,6 +80,70 @@ public class ViewController extends Controller {
 		renderNull();
 	}
 	
+	//手动同步报告
+	public void sdtb() {
+		try {
+		
+		DataService dService = ServiceFactory.getService(DataService.class);
+
+		List<Record> records = Db.use("connected").find("select * from reportinfo where REVIEWDATE between ? and ?",this.getPara("from"),this.getPara("to"));
+		for (Record record : records) {
+			Map<String, String> params = new HashMap<>();
+			// 1:exam_id 2:patient_num 3:accession_num 4:study_uid
+			params.put("type", "2");
+
+			params.put("institution_id", PropKit.get("institution_id"));
+
+			params.put("code", record.getStr("ACCESSIONNUMBER"));
+			//报告医生姓名
+			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"));
+			//申请医生
+			params.put("application_doctor", 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("阳")?"2":"1");
+			//住院号
+			params.put("hopitalized_no", "");
+			
+			dService.saveReport(params);
+
+		}
+
+		renderJson(records);
+		
+		} catch (Exception e) {
+			// TODO: handle exception
+			renderText(e.toString());
+		}
+
+	}
 	public static DruidPlugin createConnectedDruidPlugin() {
 
 		return new DruidPlugin(PropKit.get("jdbcUrl_connected"), PropKit.get("user_connected"),PropKit.get("password_connected").trim());
@@ -117,27 +181,23 @@ public class ViewController extends Controller {
 	 * @param dateStr
 	 * @return
 	 */
-	private Date parseStringToDate(String dateStr) {
+	private String parseStringToDate(String dateStr) {
 		if (dateStr == null) {
-			return new Date();
+			return "";
 		}
-		SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		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 date;
+        return timeString;
 	}
 
-	public static void main(String[] args) {
-        Map<String,String> paramsMap=new HashMap<String,String>();
-        paramsMap.put("institution_id", "44100001");
-
-		String contentString = doPost("https://risserver3.pacsonline.cn/butt/getExam/butt/getExam", paramsMap);
-		System.out.println(contentString);
-
-	}
 }

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

@@ -75,7 +75,7 @@ public class DataTask implements ITask {
 			//检查结果1阴2阳
 			params.put("report_result", record.getStr("RESULT").contains("阳")?"2":"1");
 			//住院号
-			params.put("hopitalized_no", "0");
+			params.put("hopitalized_no", "");
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.saveReport(params);