From f2f83ca83f31f9a9cd0e78d394000c08f5434cdd Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 19 七月 2024 13:35:31 +0800
Subject: [PATCH] zjh 2024/07/19-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 3286075..2213707 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -469,13 +469,21 @@
}
}
- //鍚屾妫�鏌�
- Map<String, Object> maps = new HashMap<>();
- maps.put("his_registration_id", order.getCardId());
- maps.put("ksbm", "浣撴涓績");
- maps.put("pagecount", 100);
- maps.put("page", 1);
- AjaxResult results = service.getHISDataNew("Getexamreportinfo", maps);
+ /*鍚屾妫�鏌� his鎺ュ彛*/
+
+// Map<String, Object> maps = new HashMap<>();
+// maps.put("his_registration_id", order.getCardId());
+// maps.put("ksbm", "浣撴涓績");
+// maps.put("pagecount", 100);
+// maps.put("page", 1);
+// AjaxResult results = service.getHISDataNew("Getexamreportinfo", maps);
+
+
+ /*鍚屾妫�鏌� his瀛樺偍杩囩▼*/
+ AjaxResult results = jcsqdService.getTjJcProByHisCall("浣撴涓績",order.getCardId(),"''",100,1,"'1'");
+ DynamicDataSourceContextHolder.clearDataSourceType();
+
+
if (Integer.parseInt(results.get("code").toString()) == 200) {
List<Map<String, Object>> datas = (List<Map<String, Object>>) results.get("data");
if(null !=datas && datas.size()>0){
@@ -511,11 +519,21 @@
if(null !=objectMap.get("YXZD") || !objectMap.get("YXZD").equals(""))
jcbgd.setYxzd(objectMap.get("YXZD").toString());
- if(null !=objectMap.get("YXBX") || !objectMap.get("YXBX").equals(""))
- jcbgd.setYxbx(objectMap.get("YXBX").toString());
-
+ if(null !=objectMap.get("YXBX") || !objectMap.get("YXBX").equals("")){
+ if(objectMap.get("YXBX").toString().equals("null")){
+ jcbgd.setYxbx("鏈寮傚父");
+ }else {
+ jcbgd.setYxbx(objectMap.get("YXBX").toString());
+ }
+ }
if(null !=objectMap.get("SJJLSJ") || !objectMap.get("SJJLSJ").equals(""))
jcbgd.setZdsj(objectMap.get("SJJLSJ").toString());
+
+ if(null !=objectMap.get("JCBW") || !objectMap.get("JCBW").equals(""))
+ jcbgd.setJcbw(objectMap.get("JCBW").toString());
+
+ if(null !=objectMap.get("SQRQSJ") || !objectMap.get("SQRQSJ").equals(""))
+ jcbgd.setSqsj(objectMap.get("SQRQSJ").toString());
jcbgdService.save(jcbgd);
}
@@ -989,10 +1007,13 @@
} catch (NumberFormatException ignored) {
ignored.printStackTrace();
}
+ if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
+ tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
+ }
+ }else {
+ tjOrderDetail.setProResult(tjOrderDetail.getProResult());
}
- if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
- tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
- }
+
dels.add(tjOrderDetail);
}
}
--
Gitblit v1.8.0