commit

DataFusion/res/config.properties

@@ -10,4 +10,4 @@ nw_key             = 2c1db8e7eee65eeeebacb0afbec37096
 jdbcUrl_local  = jdbc:mysql://127.0.0.1:3306/pacsonline?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
 #jdbcUrl_local  = jdbc:mysql://127.0.0.1:3306/lisdb?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
 user_local	   = root
-password_local = lis2022@
+password_local = Zskk_2023

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

@@ -126,7 +126,7 @@ public class ViewController extends Controller {
 	        jsonObject2.put("pattoken", "appuserrequest");
 	        jsonObject2.put("hispatid", this.getPara("hpid"));
 	        jsonObject.put("data", jsonObject2);
-			String c=postWithJson(this.getPara("url","http://192.168.100.181:8102/api/tjwebapi/CommQuery"),jsonObject);
+			String c=postWithJson(this.getPara("url","http://192.168.100.181:8102/tjwebapi/generalQuery"),jsonObject);
 	        this.renderText(c);
 		} catch (Exception e) {
 			// TODO: handle exception
@@ -149,37 +149,10 @@ public class ViewController extends Controller {
 	}
 	
 	public void testWeb3() {
-		try {
-	        JSONObject jsonObject = new JSONObject();
-	        jsonObject.put("functionCode", "queryPatByPatId");
-	        jsonObject.put("userid", "1301");
-	        JSONObject jsonObject2 = new JSONObject();
-	        jsonObject2.put("pattoken", "appuserrequest");
-	        jsonObject2.put("hispatid", this.getPara("hpid"));
-	        jsonObject.put("data", jsonObject2);
-
-	        RequestBody requestBody = RequestBody.create(JSON_CODE, jsonObject.toJSONString());
-
-			Request request = new Request.Builder().url("http://192.168.100.181:8102/api/tjwebapi/CommQuery").post(requestBody).build();
+		DataService dService = ServiceFactory.getService(DataService.class);
+		JSONObject jsonObjectback =dService.getPatientInfoFromHis("MZ2874417");
+        this.renderJson(jsonObjectback);
 
-			try (Response response = OKHTTP_CLIENT.newCall(request).execute()) {
-				if (!response.isSuccessful())
-					throw new IOException("Unexpected code " + response);
-				String content = response.body().string();
-				System.out.println(content);
-		        this.renderText(content);
-//				return content;
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-//				return null;
-				this.renderText(e.toString());
-			}
-	        
-		} catch (Exception e) {
-			// TODO: handle exception
-			this.renderText(e.toString());
-		}
 	}
 	
 	public void bg() {
@@ -187,11 +160,11 @@ public class ViewController extends Controller {
 //    	map.put("num", 30);
 //    	map.put("createdAt", "2023-06-01 00:00:00,2023-06-20 00:00:00");
 //    	map.put("exam_status", "3,7,8,9");
-    	params.put("type", "4");
+    	params.put("type", "1");
 		
 //		params.put("institution_id", PropKit.get("institution_id"));
 
-		params.put("code", "1.2.392.200036.9125.2.138612190166.20230613001148");
+		params.put("code", "cnb5116vou29cjf1");
 		//报告医生姓名
 		params.put("report_doctor_name", "");
 		//报告时间

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

@@ -28,64 +28,73 @@ public class DataTask implements ITask {
 			return;
 		}
 		for (Record record : studyidfinds) {
-			Record pacsRecord = Db.use("connected").findFirst("select * from examinfo where STUDYUID=?",record.getStr("studyuid"));
-			if (pacsRecord == null) {
+			try {
+				Record pacsRecord = Db.use("connected").findFirst("select * from examinfo where STUDYUID=?",record.getStr("studyuid"));
+				if (pacsRecord == null) {
+					continue;
+				}
+				Map <String,Object> params = new HashMap<String,Object>();
+		    	params.put("type", "1");
+		    	
+				params.put("code", record.getStr("id"));
+				//报告医生姓名
+				params.put("report_doctor_name", pacsRecord.getStr("REPORTDOCTOR")==null?"":record.getStr("REPORTDOCTOR"));
+				//报告时间
+				params.put("report_datetime", pacsRecord.getStr("REVIEWDATE")==null?"":record.getStr("REVIEWDATE"));
+				//审核医生姓名
+				params.put("review_doctor_name", pacsRecord.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
+				//审核时间
+				params.put("review_datetime", pacsRecord.getStr("REVIEWDATE")==null?"":record.getStr("REVIEWDATE"));
+				//确认医生姓名
+				params.put("confirm_doctor_name", pacsRecord.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
+				//确认时间
+				params.put("confirm_datetime", pacsRecord.getStr("REVIEWDATE")==null?"":record.getStr("REVIEWDATE"));
+				//意见建议
+				params.put("description", pacsRecord.getStr("DESCRIPTION")==null?"":record.getStr("DESCRIPTION"));
+				//影像所见
+				params.put("impression", pacsRecord.getStr("IMPRESSION")==null?"":record.getStr("IMPRESSION"));
+				//exams表
+				//申请科室
+				params.put("application_department", pacsRecord.getStr("DEPARTMENT")==null?"":record.getStr("DEPARTMENT"));
+				//申请医生
+				params.put("application_doctor", pacsRecord.getStr("CLINICALDOCTOR")==null?"":record.getStr("CLINICALDOCTOR"));
+				//临床诊断
+				params.put("clin_diag", pacsRecord.getStr("DIAGNOSIS")==null?"":record.getStr("DIAGNOSIS"));
+				//症状
+				params.put("clin_symp", "");
+				//patient_infos表
+				//患者姓名
+				params.put("name", pacsRecord.getStr("PATIENTNAME")==null?"":record.getStr("PATIENTNAME"));
+//				JSONObject jsonObjectback = dService.getPatientInfoFromHis(pacsRecord.getStr("OUTPATIENTNUM"));
+				//患者手机号
+//				params.put("phone", jsonObjectback.getString("PHONENO"));
+				//患者身份证号
+//				params.put("card_num", jsonObjectback.getString("ID_NO"));
+				//患者手机号
+				params.put("phone", "");
+				//患者身份证号
+				params.put("card_num","");
+				//检查结果1阴2阳
+				params.put("report_result", "0");
+				//住院号
+//				params.put("hopitalized_no", record.getStr("patientNumber"));
+				//门诊号
+//				params.put("out_patient", record.getStr("patientNumber"));
+				//病人ID
+//				params.put("his_patient_id", record.getStr("patientNumber"));
+				//检查方法
+				params.put("exam_project", pacsRecord.getStr("PROJECT")==null?"":record.getStr("PROJECT"));  
+		        String content =  dService.saveReport(params);
+				JSONObject jsonObject = JSON.parseObject(content);
+				if (jsonObject.getString("msg").equals("success")) {
+					Record user = Db.findById("study", record.getStr("id")).set("reportstatus", 100);
+					Db.update("study", user);
+				}
+			} catch (Exception e) {
+				// TODO: handle exception
 				continue;
 			}
-			Map <String,Object> params = new HashMap<String,Object>();
-	    	params.put("type", "1");
-	    	
-			params.put("code", record.getStr("id"));
-			//报告医生姓名
-			params.put("report_doctor_name", pacsRecord.getStr("REPORTDOCTOR")==null?"":record.getStr("REPORTDOCTOR"));
-			//报告时间
-			params.put("report_datetime", pacsRecord.getStr("REPORTDATE")==null?"":record.getStr("REVIEWDATE"));
-			//审核医生姓名
-			params.put("review_doctor_name", pacsRecord.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
-			//审核时间
-			params.put("review_datetime", pacsRecord.getStr("REVIEWDATE"));
-			//确认医生姓名
-			params.put("confirm_doctor_name", pacsRecord.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
-			//确认时间
-			params.put("confirm_datetime", pacsRecord.getStr("REVIEWDATE"));
-			//意见建议
-			params.put("description", pacsRecord.getStr("DESCRIPTION"));
-			//影像所见
-			params.put("impression", pacsRecord.getStr("IMPRESSION"));
-			//exams表
-			//申请科室
-			params.put("application_department", pacsRecord.getStr("DEPARTMENT")==null?"":record.getStr("DEPARTMENT"));
-			//申请医生
-			params.put("application_doctor", pacsRecord.getStr("CLINICALDOCTOR")==null?"":record.getStr("CLINICALDOCTOR"));
-			//临床诊断
-			params.put("clin_diag", pacsRecord.getStr("DIAGNOSIS")==null?"":record.getStr("DIAGNOSIS"));
-			//症状
-			params.put("clin_symp", "");
-			//patient_infos表
-			//患者姓名
-			params.put("name", pacsRecord.getStr("PATIENTNAME")==null?"":record.getStr("PATIENTNAME"));
-			JSONObject jsonObjectback = dService.getPatientInfoFromHis(pacsRecord.getStr("OUTPATIENTNUM"));
 			
-			//患者手机号
-			params.put("phone", jsonObjectback.getString("PHONENO"));
-			//患者身份证号
-			params.put("card_num", jsonObjectback.getString("ID_NO"));
-			//检查结果1阴2阳
-			params.put("report_result", pacsRecord.getStr("RESULT").contains("2")?"2":"1");
-			//住院号
-//			params.put("hopitalized_no", record.getStr("patientNumber"));
-			//门诊号
-//			params.put("out_patient", record.getStr("patientNumber"));
-			//病人ID
-//			params.put("his_patient_id", record.getStr("patientNumber"));
-			//检查方法
-			params.put("exam_project", pacsRecord.getStr("PROJECT")==null?"":record.getStr("PROJECT"));  
-	        String content =  dService.saveReport(params);
-			JSONObject jsonObject = JSON.parseObject(content);
-			if (jsonObject.getString("msg").equals("success")) {
-				Record user = Db.findById("study", record.getStr("id")).set("reportstatus", 100);
-				Db.update("study", user);
-			}
 
 		}