commit

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

@@ -82,9 +82,9 @@ public class ZskkConfig extends JFinalConfig {
 //		arpConnected.setDialect(new OracleDialect());
 //		me.add(arpConnected);
 		
-		ActiveRecordPlugin arpLocal = new ActiveRecordPlugin("local", druidPluginLocal);
-		arpLocal.setDialect(new MysqlDialect());
-		me.add(arpLocal);
+//		ActiveRecordPlugin arpLocal = new ActiveRecordPlugin("local", druidPluginLocal);
+//		arpLocal.setDialect(new MysqlDialect());
+//		me.add(arpLocal);
 
 		//获取待匹配列表
 		Cron4jPlugin upData = new Cron4jPlugin();

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

@@ -63,7 +63,7 @@ public class ViewController extends Controller {
     	String aesEncryptStr = AESUtils.aesEncryptStr(JSON.toJSONString(map), PropKit.get("nw_key"),IV);
     	Map <String,String> mapaes = new HashMap<String,String>();
     	mapaes.put("data",aesEncryptStr);
-		String content = postWithParameters("http://127.0.0.1:8082/df/view/getExam", mapaes);
+		String content = postWithParameters("http://127.0.0.1:8082/df/view/getExams", mapaes);
 //		this.renderText(content);
 
 //	    JSONObject jsonObject = JSON.parseObject(content);
@@ -126,17 +126,65 @@ public class ViewController extends Controller {
 	        jsonObject2.put("pattoken", "appuserrequest");
 	        jsonObject2.put("hispatid", this.getPara("hpid"));
 	        jsonObject.put("data", jsonObject2);
-
-//			String c=postWithJson(this.getPara("hpid")"http://192.168.100.181:8102/api/tjwebapi/CommQuery",jsonObject);
 			String c=postWithJson(this.getPara("url","http://192.168.100.181:8102/api/tjwebapi/CommQuery"),jsonObject);
-
 	        this.renderText(c);
+		} catch (Exception e) {
+			// TODO: handle exception
+			this.renderText(e.toString());
+		}
+	}
+	
+	public void testWeb2() {
+		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);
+//			String c=postWithJson(this.getPara("url","http://192.168.100.181:8102/api/tjwebapi/CommQuery"),jsonObject);
+	        this.renderJson(jsonObject);
+		} catch (Exception e) {
+			// TODO: handle exception
+			this.renderText(e.toString());
+		}
+	}
+	
+	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();
+
+			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() {
 		Map <String,Object> params = new HashMap<String,Object>();
 //    	map.put("num", 30);
@@ -150,7 +198,7 @@ public class ViewController extends Controller {
 		//报告医生姓名
 		params.put("report_doctor_name", "");
 		//报告时间
-		params.put("report_datetime", "2023-06-10 14:55:54");
+		params.put("report_datetime", "2023-06-10 00:00:00");
 		//审核医生姓名
 		params.put("review_doctor_name", "");
 		//审核时间

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

@@ -27,60 +27,59 @@ public class DataTask implements ITask {
 		if (studyidfinds == null) {
 			return;
 		}
-		
-		Map <String,Object> params = new HashMap<String,Object>();
-//    	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("institution_id", PropKit.get("institution_id"));
+		for (Record record : studyidfinds) {
+			Map <String,Object> params = new HashMap<String,Object>();
+	    	params.put("type", "1");
+	    	
+			params.put("code", record.getStr("id"));
+			//报告医生姓名
+			params.put("report_doctor_name", "");
+			//报告时间
+			params.put("report_datetime", "2023-06-09 14:55:54");
+			//审核医生姓名
+			params.put("review_doctor_name", "");
+			//审核时间
+			params.put("review_datetime", "2023-06-10 14:55:54");
+			//确认医生姓名
+			params.put("confirm_doctor_name", "");
+			//确认时间
+			params.put("confirm_datetime", "2023-06-13 14:55:54");
+			//意见建议
+			params.put("description", "两侧额顶叶，左侧颞叶皮层下自质异常信号，符合脑白质高信号，改良Fazekas 1级。头MRA示:左侧大脑前动脉A1段血流影较对侧细。左侧大脑前动脉A2段起始部样柱状突起。右侧推动脉版内股血流影拖对侧细。基底动脉血流影走行迂曲。");
+			//影像所见
+			params.put("impression", "两侧额顶叶、左侧颞叶皮层下白质见多发斑点状T1等或略低T2略高信号。脑干及两侧小脑半球未几常。中线居中，脑室系统及脑沟脑裂未见异常，鞍区及两侧桥小脑角区未见异常。小脑扁桃体无下症。左侧大脑前动脉A2股起始部柱状突起。两侧大脑中动脉及颈内动脉颅内段血流信号影未见明显异常。右侧椎动脉版内段血流影软对侧细。基底动脉血流影走曲。两侧大脑后动脉及余动脉血流信号影未见异常。");
+			//exams表
+			//申请科室
+			params.put("application_department", "神内四科门诊");
+			//申请医生
+			params.put("application_doctor", "刘舒");
+			//临床诊断
+			params.put("clin_diag", "神清语利，颇神经检查未见异常，四肢活动自如，病理征未引出");
+			//症状
+			params.put("clin_symp", "头痛");
+			//patient_infos表
+			//患者姓名
+			params.put("name", "薄永琴");
+			//患者手机号
+			params.put("phone", "");
+			//患者身份证号
+			params.put("card_num", "130222196308250029");
+			//检查结果1阴2阳
+			params.put("report_result", "2");
+			//住院号
+//			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", "[头颅，平扫][头颅，MRA]");  
+	        String d=  dService.saveReport(params);
+	        Record user = Db.findById("study", record.getStr("id")).set("reportstatus", 1);
+	        Db.update("study", user);
 
-		params.put("code", "1.2.392.200036.9125.2.138612190166.20230613001148");
-		//报告医生姓名
-		params.put("report_doctor_name", "");
-		//报告时间
-		params.put("report_datetime", "2023-06-13 14:55:54");
-		//审核医生姓名
-		params.put("review_doctor_name", "");
-		//审核时间
-		params.put("review_datetime", "2023-06-13 14:55:54");
-		//确认医生姓名
-		params.put("confirm_doctor_name", "");
-		//确认时间
-		params.put("confirm_datetime", "2023-06-13 14:55:54");
-		//意见建议
-		params.put("description", "两侧额顶叶，左侧颞叶皮层下自质异常信号，符合脑白质高信号，改良Fazekas 1级。头MRA示:左侧大脑前动脉A1段血流影较对侧细。左侧大脑前动脉A2段起始部样柱状突起。右侧推动脉版内股血流影拖对侧细。基底动脉血流影走行迂曲。");
-		//影像所见
-		params.put("impression", "两侧额顶叶、左侧颞叶皮层下白质见多发斑点状T1等或略低T2略高信号。脑干及两侧小脑半球未几常。中线居中，脑室系统及脑沟脑裂未见异常，鞍区及两侧桥小脑角区未见异常。小脑扁桃体无下症。左侧大脑前动脉A2股起始部柱状突起。两侧大脑中动脉及颈内动脉颅内段血流信号影未见明显异常。右侧椎动脉版内段血流影软对侧细。基底动脉血流影走曲。两侧大脑后动脉及余动脉血流信号影未见异常。");
-		//exams表
-		//申请科室
-		params.put("application_department", "神内四科门诊");
-		//申请医生
-		params.put("application_doctor", "刘舒");
-		//临床诊断
-		params.put("clin_diag", "神清语利，颇神经检查未见异常，四肢活动自如，病理征未引出");
-		//症状
-		params.put("clin_symp", "头痛");
-		//patient_infos表
-		//患者姓名
-		params.put("name", "薄永琴");
-		//患者手机号
-		params.put("phone", "");
-		//患者身份证号
-		params.put("card_num", "130222196308250029");
-		//检查结果1阴2阳
-		params.put("report_result", "2");
-		//住院号
-//		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", "[头颅，平扫][头颅，MRA]");    	
-        String content = JSON.toJSONString(params);
-		
+		}
+		  			
 //        JSONArray jsonArray = dService.getExamList(50);	
 //        for (Object object : jsonArray) {
 //        	try {