From 73a816fd2b1e29c25d615c85ce34b12b55c16ccf Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 20 一月 2025 13:41:45 +0800
Subject: [PATCH] zjh20250120

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java |   32 +++++++++++++++++++++++++++++---
 1 files changed, 29 insertions(+), 3 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 8c0038e..839c23c 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
@@ -122,6 +122,8 @@
     private RedissonClient redissonClient;
     @Autowired
     private ITjRulesService rulesService;
+    @Autowired
+    private ITjProAdvicerulesService tjProAdvicerulesService;
 
 
     @GetMapping ("/ceshicc")
@@ -771,6 +773,7 @@
                                 hysqd.setShrdm(jsonObject.getStr("JYYSBH"));
                                 hysqd.setShrxm(jsonObject.getStr("JYYSQM"));
                                 hysqd.setJybgjg(jsonObject.getStr("JYBGJG"));
+                                hysqd.setCreateTime(new Date());
                                 QueryWrapper<LtkjHysqd> queryWrapper = new QueryWrapper<>(hysqd);
                                 List<LtkjHysqd> list = ltkjHysqdService.list(queryWrapper);
                                 if (list.isEmpty())
@@ -837,6 +840,7 @@
                                             jcbgd.setJcbw(objectMap.get("JCBW").toString());
                                         if (null != objectMap.get("SQRQSJ") || !objectMap.get("SQRQSJ").equals(""))
                                             jcbgd.setSqsj(objectMap.get("SQRQSJ").toString());
+                                            jcbgd.setCreateTime(new Date());
                                         jcbgdService.save(jcbgd);
                                     }
                                     jcsqdService.saveLtkjExamJcsqd(order.getCardId());
@@ -900,6 +904,7 @@
                 bgd.setShys(js.getStr("SHRBH"));
                 bgd.setShysmc(js.getStr("SHRXM"));
                 bgd.setYcbz(js.getStr("YCTS"));
+                bgd.setCreateTime(new Date());
 //                            bgd.setTpurl(js.getStr(""));
                 QueryWrapper<LtkjHybgd> queryWrapper = new QueryWrapper<>(bgd);
                 List<LtkjHybgd> list = ltkjHybgdService.list(queryWrapper);
@@ -1654,10 +1659,31 @@
                     for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                         if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
                             if(null !=tjOrderDetail.getProId()&& null !=tjOrderDetail.getYcbz()){
-                                List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString(),"",tjOrderDetail.getYcbz(),tjNumber);
-                                if(null !=maps && !maps.isEmpty()){
-                                    tjOrderDetail.setAdvices(maps);
+                                if(!tjOrderDetail.getDeptId().equals("2")){
+                                    List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
+                                            ,"",tjOrderDetail.getYcbz().replaceAll(" ", ""),tjNumber
+                                            ,tjOrderDetail.getProName().replaceAll("\\锛圼^\\锛塢*\\锛�", "")
+                                                    .replaceAll("[ 娴嬪畾]","")
+                                            ,tjOrderDetail.getProResult());
+                                    if(null !=maps && !maps.isEmpty()){
+                                        tjOrderDetail.setAdvices(maps);
+                                    }
+                                }else {
+                                    String[] split = tjOrderDetail.getProResult().split("銆倈,|锛�");
+                                    List<Map<String,Object>> mapList=new ArrayList<>();
+                                    for (String s : split) {
+                                                s = s.replaceAll("\n", "");
+//                                        Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
+                                        Map<String,Object> maps= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(),s,"0");
+                                        if(null !=maps && !maps.isEmpty()){
+                                            Object bt = maps.get("bt");
+                                            Object nr = maps.get("nr");
+                                            if(null !=bt || null !=nr) mapList.add(maps);
+                                        }
+                                    }
+                                    tjOrderDetail.setAdvices(mapList);
                                 }
+
                             }
 
                             dels.add(tjOrderDetail);

--
Gitblit v1.8.0