刘韬 2 years ago
parent
commit
8c29a4295c

+ 59 - 0
DataFusion/src/com/zskk/control/ViewController.java

@@ -19,6 +19,8 @@ import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.activerecord.dialect.OracleDialect;
 import com.jfinal.plugin.activerecord.dialect.SqlServerDialect;
 import com.jfinal.plugin.druid.DruidPlugin;
+import com.zskk.service.DataService;
+import com.zskk.service.ServiceFactory;
 import com.zskk.tools.AESUtils;
 
 import okhttp3.FormBody;
@@ -135,6 +137,63 @@ public class ViewController extends Controller {
 			this.renderText(e.toString());
 		}
 	}
+	public void bg() {
+		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"));
+
+		params.put("code", "1.2.392.200036.9125.2.138612190166.20230613001148");
+		//报告医生姓名
+		params.put("report_doctor_name", "");
+		//报告时间
+		params.put("report_datetime", "2023-06-10 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]");  
+		DataService dService = ServiceFactory.getService(DataService.class);
+        dService.saveReport(params);
+        this.renderText("c");
+
+	}
 	
 	public String postWithJson(String url, JSONObject jsonObject) {
 

+ 8 - 9
DataFusion/src/com/zskk/service/DataService.java

@@ -22,9 +22,9 @@ import okhttp3.Response;
 
 public class DataService {
 	
-    private static String GET_EXAM_URL = "http://127.0.0.1:8082/df/view/getExam";
+    private static String GET_EXAM_URL = "http://127.0.0.1:8082/df/view/getExams";
     
-    private static String SAVE_REPORT_URL = "http://10.200.100.155:8080/df/view/saveReport";
+    private static String SAVE_REPORT_URL = "http://127.0.0.1:8082/df/view/saveReport";
     
     private static String UPDATE_PATIENT_URL = "http://10.200.100.155:8080/df/view/saveExam";
     
@@ -49,10 +49,6 @@ public class DataService {
     	Map <String,String> mapaes = new HashMap<String,String>();
     	mapaes.put("data",aesEncryptStr);
 		String content = postWithParameters(GET_EXAM_URL, mapaes);
-//	    JSONObject jsonObject = JSON.parseObject(content);
-//	    if (!jsonObject.getString("msg").equals("success")) {
-//			return null;
-//		}
         String aesDecodeStr ="";
 		try {
 			aesDecodeStr = AESUtils.aesDecodeStr(content, PropKit.get("nw_key"),IV);
@@ -71,9 +67,12 @@ public class DataService {
      * @param instutionId
      * @param number
      */
-    public void saveReport(Map <String,String> map) {
-		postWithParameters(SAVE_REPORT_URL, map);
-		
+    public void saveReport(Map <String,Object> map) {
+        String IV = "0000000000000000";
+    	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(SAVE_REPORT_URL, mapaes);	
 	}
     
     /**

+ 51 - 0
DataFusion/src/com/zskk/task/DataTask.java

@@ -28,7 +28,58 @@ public class DataTask implements ITask {
 			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"));
+
+		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) {

+ 1 - 1
DataFusion/src/com/zskk/task/ReviewTask.java

@@ -81,7 +81,7 @@ public class ReviewTask implements ITask {
 				params.put("exam_method", record.getStr("JianchaFangfa") == null ? "" : record.getStr("JianchaFangfa"));
 				ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 				tService.execute(() -> {
-					dService.saveReport(params);
+//					dService.saveReport(params);
 				});
 
 			} catch (Exception e) {