From d7d79867f7ccd9b4d13fe7b9e5f5850ebf794639 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 09 七月 2024 13:36:06 +0800
Subject: [PATCH] zjh 2024/07/9-1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java |   34 +++++++++++++++++++++++++++++++++-
 1 files changed, 33 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 967e833..3286075 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
@@ -436,6 +436,36 @@
                                     ltkjHybgdService.save(bgd);
                                 }
                             }
+
+                            Map<String, Object> fbhashMap = new HashMap<>();
+                            fbhashMap.put("jybgid", hysqd.getTmh());
+                            AjaxResult fbres = controller.Getlabgermrepinfo(fbhashMap);
+                            String ajaxResult = getAjaxResult(fbres);
+                            JSONObject fbobject = getJSONObject(ajaxResult);
+                            String fbcode = fbobject.getStr("ResultCode");
+                            if (null != fbcode && fbcode.equals("0")) {
+                                JSONArray datas = fbobject.getJSONArray("ResultData");
+                                for (Object o : datas) {
+                                    JSONObject js = (JSONObject) o;
+                                    LtkjHybgd bgd = new LtkjHybgd();
+                                    bgd.setTmh(hysqd.getTmh());
+                                    bgd.setJcxmid(hysqd.getXmid());
+                                    bgd.setJcxm(hysqd.getXmmc());
+                                    bgd.setTdh(js.getStr(""));
+                                    bgd.setJyjg(js.getStr("JCJG"));
+                                    bgd.setJgdw("/");
+                                    bgd.setFwzdz("/");
+                                    bgd.setFwzgz("/");
+                                    bgd.setFwz("/");
+                                    bgd.setJysj(js.getStr("BGRQ"));
+                                    bgd.setJyys(hysqd.getSqrxm());
+                                    bgd.setShsj(js.getStr("BGRQ"));
+                                    bgd.setShys(hysqd.getShrdm());
+                                    bgd.setShysmc(hysqd.getShrxm());
+                                    ltkjHybgdService.save(bgd);
+                                }
+                            }
+
                         }
                     }
 
@@ -932,12 +962,13 @@
                 parent.put("parent", remark.getProName());
                 parent.put("parentId", remark.getProsId());
                 parent.put("xmlb", remark.getXmlb());
+                parent.put("", remark.getXmlb());
                 List<TjOrderDetail> dels = new ArrayList<>();
                 if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
                     for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                         if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
                             String ckfw = tjOrderDetail.getStanId();
-                            if (StrUtil.isNotBlank(tjOrderDetail.getProAdvice())) {
+                            if (null !=ckfw && StrUtil.isNotBlank(tjOrderDetail.getProAdvice())) {
                                 ckfw = ckfw.replace(tjOrderDetail.getProAdvice().trim(), "");
                             }
                             if (StrUtil.isNotBlank(ckfw)) {
@@ -977,6 +1008,7 @@
                     }
                     parent.put("sons", dels);
                     parent.put("remark", remark.getRemark());
+                    parent.put("jgbx", remark.getJgbx());
                     if (remark.getDoctorName() != null) {
                         parent.put("doctorName", remark.getDoctorName());
                     }

--
Gitblit v1.8.0