From fc20d2dbefb52ad199c927e36f22a7c8bfa1a729 Mon Sep 17 00:00:00 2001 From: zhaowenxuan <chacca165@163.com> Date: 星期二, 04 三月 2025 17:00:44 +0800 Subject: [PATCH] 去除建议性别查询条件 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 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 4f71514..4f3e9af 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 @@ -745,6 +745,9 @@ asyncService.updateCheckType(order.getTjNumber()); } + // 11:42:04.617 [http-nio-5000-exec-72] ERROR c.a.d.p.DruidDataSource - [init,905] - init datasource error, url: jdbc:sqlserver://192.168.10.2:1433;DatabaseName=hospital;&characterEncoding=utf8 + //com.microsoft.sqlserver.jdbc.SQLServerException: 椹卞姩绋嬪簭鏃犳硶閫氳繃浣跨敤瀹夊叏濂楁帴瀛楀眰(SSL)鍔犲瘑涓� SQL Server 寤虹珛瀹夊叏杩炴帴銆傞敊璇�:鈥淣o appropriate protocol (protocol is disabled or cipher suites are inappropriate)鈥濄�� + // //寮�鍚拰his瀵规帴 if (null != sfkqdyhis && sfkqdyhis.equals("Y")) { List<String> baoGaoDans = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId()); @@ -770,6 +773,11 @@ JSONArray data = object.getJSONArray("ResultData"); for (Object datum : data) { JSONObject jsonObject = (JSONObject) datum; + LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(order.getCardId(), jsonObject.getStr("JYBGID")); + if (null != jybgid) { + ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(order.getCardId(), jsonObject.getStr("JYBGID")); + ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(jybgid.getTmh()); + } boolean isInsertHysqd = false; LtkjHysqd hysqd = new LtkjHysqd(); hysqd.setTjh(order.getCardId()); @@ -881,7 +889,7 @@ } return AjaxResult.error("璇ヤ汉鍛樻暟鎹鍦ㄥ悓姝ヤ腑锛岃绋嶇瓑"); } catch (InterruptedException e) { - e.printStackTrace(); + log.error(String.valueOf(e),e.getMessage()); return AjaxResult.error("璇ヤ汉鍛樻暟鎹鍦ㄥ悓姝ヤ腑锛岃绋嶇瓑"); } finally { lock.unlock(); -- Gitblit v1.8.0