commit

DataFusion/res/config.properties

@@ -7,7 +7,7 @@ password_connected = yunyingxiang
 institution_id     = 06300009
 nw_key             = 2c1db8e7eee65eeeebacb0afbec37096
 #DB-local partners
-#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
+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@

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

@@ -78,13 +78,13 @@ public class ZskkConfig extends JFinalConfig {
 
 
 		// 配置ActiveRecord插件
-//		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-//		arpConnected.setDialect(new OracleDialect());
-//		me.add(arpConnected);
+		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
+		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();
@@ -93,7 +93,7 @@ public class ZskkConfig extends JFinalConfig {
 		
 		//获取报告
 		Cron4jPlugin cpData = new Cron4jPlugin();
-		cpData.addTask("*/1 * * * *", new DataTask());
+		cpData.addTask("*/5 * * * *", new DataTask());
 		me.add(cpData);
 		
 //		Cron4jPlugin cpData = new Cron4jPlugin();

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

@@ -135,20 +135,17 @@ public class ViewController extends Controller {
 	}
 	
 	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());
-		}
+		JSONObject jsonObject = new JSONObject();
+        jsonObject.put("functionCode", "queryPatByPatId");
+        jsonObject.put("userid", "1301");
+        JSONObject jsonObject2 = new JSONObject();
+        jsonObject2.put("pattoken", "appuserrequest");
+        jsonObject2.put("hispatid", "MZ2874417");
+        jsonObject.put("data", jsonObject2);
+		String content=postWithJson("http://192.168.100.181:8102/tjwebapi/generalQuery",jsonObject);
+		JSONObject jsonObjecthis = JSON.parseObject(content);
+		JSONObject jsonObjectback = jsonObjecthis.getJSONObject("data").getJSONObject("PatInfo");
+        this.renderJson(jsonObjectback);
 	}
 	
 	public void testWeb3() {

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

@@ -22,9 +22,11 @@ import okhttp3.Response;
 
 public class DataService {
 	
-    private static String GET_EXAM_URL = "http://127.0.0.1:8082/df/view/getExams";
+    private static String GET_EXAM_URL = "http://10.200.100.155:8080/df/view/getExams";
     
-    private static String SAVE_REPORT_URL = "http://127.0.0.1:8082/df/view/saveReport";
+//    private static String SAVE_REPORT_URL = "http://127.0.0.1:8082/df/view/saveReport";
+  private static String SAVE_REPORT_URL = "http://10.200.100.155:8080/df/view/saveReport";
+
     
     private static String UPDATE_PATIENT_URL = "http://10.200.100.155:8080/df/view/saveExam";
     
@@ -86,6 +88,20 @@ public class DataService {
     postWithParameters(UPDATE_PATIENT_URL, map);
     }
     
+    public JSONObject getPatientInfoFromHis(String examno) {
+    	JSONObject jsonObject = new JSONObject();
+        jsonObject.put("functionCode", "queryPatByPatId");
+        jsonObject.put("userid", "1301");
+        JSONObject jsonObject2 = new JSONObject();
+        jsonObject2.put("pattoken", "appuserrequest");
+        jsonObject2.put("hispatid", examno);
+        jsonObject.put("data", jsonObject2);
+		String content=postWithJson("http://192.168.100.181:8102/tjwebapi/generalQuery",jsonObject);
+		JSONObject jsonObjecthis = JSON.parseObject(content);
+		JSONObject jsonObjectback = jsonObjecthis.getJSONObject("data").getJSONObject("PatInfo");
+		return jsonObjectback;
+	}
+    
     /*
      * 医院代收
      */

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

@@ -28,44 +28,50 @@ 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) {
+				continue;
+			}
 			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_doctor_name", pacsRecord.getStr("REPORTDOCTOR")==null?"":record.getStr("REPORTDOCTOR"));
 			//报告时间
-			params.put("report_datetime", "2023-06-09 14:55:54");
+			params.put("report_datetime", pacsRecord.getStr("REPORTDATE")==null?"":record.getStr("REVIEWDATE"));
 			//审核医生姓名
-			params.put("review_doctor_name", "");
+			params.put("review_doctor_name", pacsRecord.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
 			//审核时间
-			params.put("review_datetime", "2023-06-10 14:55:54");
+			params.put("review_datetime", pacsRecord.getStr("REVIEWDATE"));
 			//确认医生姓名
-			params.put("confirm_doctor_name", "");
+			params.put("confirm_doctor_name", pacsRecord.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
 			//确认时间
-			params.put("confirm_datetime", "2023-06-13 14:55:54");
+			params.put("confirm_datetime", pacsRecord.getStr("REVIEWDATE"));
 			//意见建议
-			params.put("description", "两侧额顶叶，左侧颞叶皮层下自质异常信号，符合脑白质高信号，改良Fazekas 1级。头MRA示:左侧大脑前动脉A1段血流影较对侧细。左侧大脑前动脉A2段起始部样柱状突起。右侧推动脉版内股血流影拖对侧细。基底动脉血流影走行迂曲。");
+			params.put("description", pacsRecord.getStr("DESCRIPTION"));
 			//影像所见
-			params.put("impression", "两侧额顶叶、左侧颞叶皮层下白质见多发斑点状T1等或略低T2略高信号。脑干及两侧小脑半球未几常。中线居中，脑室系统及脑沟脑裂未见异常，鞍区及两侧桥小脑角区未见异常。小脑扁桃体无下症。左侧大脑前动脉A2股起始部柱状突起。两侧大脑中动脉及颈内动脉颅内段血流信号影未见明显异常。右侧椎动脉版内段血流影软对侧细。基底动脉血流影走曲。两侧大脑后动脉及余动脉血流信号影未见异常。");
+			params.put("impression", pacsRecord.getStr("IMPRESSION"));
 			//exams表
 			//申请科室
-			params.put("application_department", "神内四科门诊");
+			params.put("application_department", pacsRecord.getStr("DEPARTMENT")==null?"":record.getStr("DEPARTMENT"));
 			//申请医生
-			params.put("application_doctor", "刘舒");
+			params.put("application_doctor", pacsRecord.getStr("CLINICALDOCTOR")==null?"":record.getStr("CLINICALDOCTOR"));
 			//临床诊断
-			params.put("clin_diag", "神清语利，颇神经检查未见异常，四肢活动自如，病理征未引出");
+			params.put("clin_diag", pacsRecord.getStr("DIAGNOSIS")==null?"":record.getStr("DIAGNOSIS"));
 			//症状
-			params.put("clin_symp", "头痛");
+			params.put("clin_symp", "");
 			//patient_infos表
 			//患者姓名
-			params.put("name", "薄永琴");
+			params.put("name", pacsRecord.getStr("PATIENTNAME")==null?"":record.getStr("PATIENTNAME"));
+			JSONObject jsonObjectback = dService.getPatientInfoFromHis(pacsRecord.getStr("OUTPATIENTNUM"));
+			
 			//患者手机号
-			params.put("phone", "");
+			params.put("phone", jsonObjectback.getString("PHONENO"));
 			//患者身份证号
-			params.put("card_num", "130222196308250029");
+			params.put("card_num", jsonObjectback.getString("ID_NO"));
 			//检查结果1阴2阳
-			params.put("report_result", "2");
+			params.put("report_result", pacsRecord.getStr("RESULT").contains("2")?"2":"1");
 			//住院号
 //			params.put("hopitalized_no", record.getStr("patientNumber"));
 			//门诊号
@@ -73,10 +79,13 @@ public class DataTask implements ITask {
 			//病人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("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);
+			}
 
 		}