commit

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

@@ -79,74 +79,7 @@ public class ViewController extends Controller {
 		e.printStackTrace();
 		}
 		}
-	
-	public void doone() {
-		try {
-			trustAllHosts();
-			DataService dService = new DataService();
-	        String ssString = dService.getExamList(10);	
-//	        for (Object object : jsonArray) {
-//				JSONObject jsonObject = JSON.parseObject(object.toString());
-//				Record record = Db.use("connected").findFirst("select * from viewname where accessionNumber=?", jsonObject.getString("accession_num"));
-//				if (record == null) {
-//					continue;
-//				}
-//				if (record.getStr("diagnosis") == null && record.getStr("description") == null) {
-//					continue;
-//				}
-//				Map<String, String> params = new HashMap<>();
-//				params.put("exam_id", jsonObject.getString("id"));
-//				//报告医生姓名
-//				params.put("report_doctor_name", record.getStr("reportdoctor"));
-//				//报告时间
-//				params.put("report_datetime", record.getStr("reportdate"));
-//				//审核医生姓名
-//				params.put("review_doctor_name", record.getStr("reviewdoctor"));
-//				//审核时间
-//				params.put("review_datetime", record.getStr("reportdate"));
-//				//确认医生姓名
-//				params.put("confirm_doctor_name", record.getStr("reviewdoctor"));
-//				//确认时间
-//				params.put("confirm_datetime", record.getStr("reportdate"));
-//				//意见建议
-//				params.put("impression", record.getStr("diagnosis"));
-//				//影像所见
-//				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", "");
-//				//症状
-//				params.put("clin_symp", "");
-//				//patient_infos表
-//				//患者姓名
-//				params.put("name", record.getStr("patientname"));
-//				//患者手机号
-//				params.put("phone", record.getStr("phone"));
-//				//患者身份证号
-//				params.put("card_num", record.getStr("idcard"));
-//				params.put("report_result", "0");
-////				ThreadPoolService tService = new ThreadPoolService();
-////				tService.execute(() -> {
-////					DataService dService2 = new DataService();
-//					dService.saveReport(params);
-////				});	
-//	        }
-	        this.renderText(ssString);
-		} catch (Exception ex) {
-			// TODO: handle exception
-			StackTraceElement stackTraceElement= ex.getStackTrace()[ex.getStackTrace().length-1];
-			System.out.println("File="+stackTraceElement.getFileName());
-			System.out.println("Line="+stackTraceElement.getLineNumber());
-			System.out.println("Method="+stackTraceElement.getMethodName());
-	        this.renderText(ex.toString());
-	        
-		}
-		
-	}
+
 	/**
 	 * post请求
 	 * @param url-请求地址

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

@@ -17,9 +17,9 @@ import okhttp3.Response;
 
 public class DataService {
 	
-    private static String GET_EXAM_URL = "http://risserver3.pacsonline.cn/butt/getExam";
+    private static String GET_EXAM_URL = "https://risserver3.pacsonline.cn/butt/getExam";
     
-    private static String SAVE_REPORT_URL = "http://risserver3.pacsonline.cn/butt/saveReport";
+    private static String SAVE_REPORT_URL = "https://risserver3.pacsonline.cn/butt/saveReport";
 	
     private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient();
     
@@ -28,17 +28,17 @@ public class DataService {
      * @param instutionId
      * @param number
      */
-    public String getExamList(Integer number) {
+    public JSONArray getExamList(Integer number) {
     	Map <String,String> map = new HashMap<String,String>();
     	map.put("institution_id", "02800001");
     	map.put("num", "10");
 		String content = postWithParameters(GET_EXAM_URL, map);
-//	    JSONObject jsonObject = JSON.parseObject(content);
-//	    if (!jsonObject.getString("msg").equals("success")) {
-//			return null;
-//		}
-//		JSONArray jsonArray = JSON.parseArray(jsonObject.getString("data"));		
-		return content;
+	    JSONObject jsonObject = JSON.parseObject(content);
+	    if (!jsonObject.getString("msg").equals("success")) {
+			return null;
+		}
+		JSONArray jsonArray = JSON.parseArray(jsonObject.getString("data"));		
+		return jsonArray;
 		
 	}
     

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

@@ -18,56 +18,56 @@ public class DataTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-//        JSONArray jsonArray = dService.getExamList(30);	
-//        for (Object object : jsonArray) {
-//			JSONObject jsonObject = JSON.parseObject(object.toString());
-//			Record record = Db.use("connected").findFirst("select * from viewname where accessionNumber=?", jsonObject.getString("accession_num"));
-//			if (record == null) {
-//				continue;
-//			}
-//			if (record.getStr("diagnosis") == null && record.getStr("description") == null) {
-//				continue;
-//			}
-//			Map<String, String> params = new HashMap<>();
-//			params.put("exam_id", jsonObject.getString("id"));
-//			//报告医生姓名
-//			params.put("report_doctor_name", record.getStr("reportdoctor"));
-//			//报告时间
-//			params.put("report_datetime", record.getStr("reportdate"));
-//			//审核医生姓名
-//			params.put("review_doctor_name", record.getStr("reviewdoctor"));
-//			//审核时间
-//			params.put("review_datetime", record.getStr("reportdate"));
-//			//确认医生姓名
-//			params.put("confirm_doctor_name", record.getStr("reviewdoctor"));
-//			//确认时间
-//			params.put("confirm_datetime", record.getStr("reportdate"));
-//			//意见建议
-//			params.put("impression", record.getStr("diagnosis"));
-//			//影像所见
-//			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", "");
-//			//症状
-//			params.put("clin_symp", "");
-//			//patient_infos表
-//			//患者姓名
-//			params.put("name", record.getStr("patientname"));
-//			//患者手机号
-//			params.put("phone", record.getStr("phone"));
-//			//患者身份证号
-//			params.put("card_num", record.getStr("idcard"));
-//			params.put("report_result", "0");
-//			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
-//			tService.execute(() -> {
-//				dService.saveReport(params);
-//			});	
-//        }
+        JSONArray jsonArray = dService.getExamList(10);	
+        for (Object object : jsonArray) {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			Record record = Db.use("connected").findFirst("select * from viewname where accessionNumber=?", jsonObject.getString("accession_num"));
+			if (record == null) {
+				continue;
+			}
+			if (record.getStr("diagnosis") == null && record.getStr("description") == null) {
+				continue;
+			}
+			Map<String, String> params = new HashMap<>();
+			params.put("exam_id", jsonObject.getString("id"));
+			//报告医生姓名
+			params.put("report_doctor_name", record.getStr("reportdoctor"));
+			//报告时间
+			params.put("report_datetime", record.getStr("reportdate"));
+			//审核医生姓名
+			params.put("review_doctor_name", record.getStr("reviewdoctor"));
+			//审核时间
+			params.put("review_datetime", record.getStr("reportdate"));
+			//确认医生姓名
+			params.put("confirm_doctor_name", record.getStr("reviewdoctor"));
+			//确认时间
+			params.put("confirm_datetime", record.getStr("reportdate"));
+			//意见建议
+			params.put("impression", record.getStr("diagnosis"));
+			//影像所见
+			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", "");
+			//症状
+			params.put("clin_symp", "");
+			//patient_infos表
+			//患者姓名
+			params.put("name", record.getStr("patientname"));
+			//患者手机号
+			params.put("phone", record.getStr("phone"));
+			//患者身份证号
+			params.put("card_num", record.getStr("idcard"));
+			params.put("report_result", "0");
+			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+			tService.execute(() -> {
+				dService.saveReport(params);
+			});	
+        }
 	}