From b7103b4da9d05a5faa3c2eea81eff376380eb7dc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 10 十二月 2024 01:00:16 +0800
Subject: [PATCH] pdf调整

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java |  124 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 107 insertions(+), 17 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 7521ecc..fcbd62b 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
@@ -63,7 +63,7 @@
  */
 @RestController
 @RequestMapping ("/check")
-@Api (tags = "鎬绘鍖诲笀鐩稿叧鎺ュ彛")
+@Api (tags = "AAAAAAAAAAAA鎬绘鍖诲笀鐩稿叧鎺ュ彛")
 @Slf4j
 public class TjCheckController {
     @Resource
@@ -121,6 +121,13 @@
     @Autowired
     private RedissonClient redissonClient;
 
+
+//    public void  csdsrw() throws InterruptedException {
+//        log.info("瀹氭椂浠诲姟寮�濮嬫墽琛�"+new Date());
+//        Thread.sleep(1000*5);
+//        log.info("瀹氭椂浠诲姟缁撴潫鎵ц"+new Date());
+//    }
+
     @GetMapping ("/getOperationPermissionsByTjNum")
     @ApiOperation (value = "(鍒濆椤甸潰  鍜� 鍖荤敓椤甸潰)鏍规嵁浣撴鍙疯幏鍙栨槸鍚﹀彲鎿嶄綔鏉冮檺鎺ュ彛  true鍙搷浣�  鍙嶄箣涓嶅彲")
     public AjaxResult getOperationPermissionsByTjNum(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
@@ -146,6 +153,24 @@
     public AjaxResult ceshi() {
         List<Map<String, Object>> ccXZxYyLisJgSt = testMapper.getCcXZxYyLisJgSt();
         return AjaxResult.success(ccXZxYyLisJgSt);
+    }
+
+
+    @GetMapping ("/pacs")
+    @ApiOperation (value = "娴嬭瘯璋冪敤pacs瑙嗗浘鏁版嵁鎺ュ彛")
+    @RepeatSubmit
+    public AjaxResult pacs() {
+        List<Map<String, Object>> ccXZxYyPacsJgSt = testMapper.getCcXZxYyPacsJgSt();
+
+        List<LtkjExamJcsqd> list = testMapper.getCcXZxYyPacsLtkjExamJcsqd("");
+
+        log.info(list.toString());
+
+        List<LtkjExamJcbgd> list1 = testMapper.getCcXZxYyPacsLtkjExamJcbgd("");
+
+        log.info(list1.toString());
+
+        return AjaxResult.success(ccXZxYyPacsJgSt);
     }
 
 
@@ -599,18 +624,14 @@
                                             }
                                         }
                                     }
-
                                 }else {
                                     return AjaxResult.error("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
                                 }
                             }
                         }
-
-
                         return AjaxResult.success("鍚屾鎴愬姛");
-
                     }
-                    else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equals("Y")){
+                    else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equalsIgnoreCase("Y")){
                         List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber());
                         if(null != hysqdList && !hysqdList.isEmpty()){
                             for (LtkjHysqd hysqd : hysqdList) {
@@ -624,12 +645,28 @@
                                     ltkjHybgdService.saveBatch(hybgdList);
                                 }
                             }
+                            DynamicDataSourceContextHolder.clearDataSourceType();
                         }
-                        testMapper.tjUpdateDetatilByVi(order.getTjNumber());
+                        List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(order.getTjNumber());
+                        if(null !=jcsqdList && !jcsqdList.isEmpty()){
+                            jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId());
+                            jcbgdService.deletedLtkjJcbgdByTjhAndTmh(order.getCardId());
+                            jcsqdService.saveBatch(jcsqdList);
+                            List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(order.getCardId());
+                            if(null != jcbgdList && !jcbgdList.isEmpty())jcbgdService.saveBatch(jcbgdList);
+                            DynamicDataSourceContextHolder.clearDataSourceType();
+                        }
+//                        String tjNumber1 = order.getTjNumber();
+//                        log.info("鏌ヨ鍑烘潵鐨勪綋妫�鍙锋槸: " + tjNumber1);
+//                        log.info("浼犺繃鏉ョ殑鐨勪綋妫�鍙锋槸: "+tjNumber);
+                        Map<String,Object> map=new HashMap<>();
+                        map.put("tjnum",tjNumber);
+                        testMapper.tjUpdateDetatilByVi(map);
+                    }else {
+                        //鍖栭獙
+                        testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                     }
-                    //鍖栭獙
-                    testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
-                    //妫�鏌�
+                  //妫�鏌�
                     return AjaxResult.success("鍚屾鎴愬姛");
                 }
                 return AjaxResult.error("鏈煡鍒拌浜哄憳浣撴璁板綍");
@@ -1160,8 +1197,12 @@
                                       @ApiParam (value = "鎬绘寤鸿") @RequestParam (required = false) String advice,
                                       @ApiParam (value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam Integer checkStatus) {
 
-        int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
-        if (num > 0) return AjaxResult.error("鏈夊欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
+        String config = configService.selectConfigByKey("sfjcwjhyqxm");
+        if(null != config && config.equalsIgnoreCase("Y")){
+            int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
+            if (num > 0) return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
+        }
+
         if (null != tjNumber) {
             Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
             SysUser sysUser = userService.getById(userId);
@@ -1419,7 +1460,7 @@
         List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanAndCgTable(tjNumber);
 
 
-        if (null != remarkList && remarkList.size() > 0) {
+        if (null != remarkList && !remarkList.isEmpty()) {
             for (TjOrderRemark remark : remarkList) {
                 Map<String, Object> parent = new HashMap<>();
                 parent.put("checkAdvice", one.getCheckAdvice());
@@ -1428,7 +1469,7 @@
                 parent.put("xmlb", remark.getXmlb());
                 parent.put("", remark.getXmlb());
                 List<TjOrderDetail> dels = new ArrayList<>();
-                if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
+                if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
                     for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                         if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
                             String ckfw = tjOrderDetail.getStanId();
@@ -1454,7 +1495,7 @@
                                         }else {
                                             tjOrderDetail.setYcbz("");
                                         }
-                                        if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
+                                        if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().isEmpty()) {
                                             tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
                                         }
                                     }else {
@@ -1466,7 +1507,6 @@
                                         if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�")) tjOrderDetail.setYcbz("鈫�");
                                     }
                                 } catch (NumberFormatException ignored) {
-                                    ignored.printStackTrace();
                                 }
                             }else {
                                 tjOrderDetail.setYcbz("");
@@ -1483,7 +1523,7 @@
                     } else {
                         parent.put("parentAdvice", null);
                     }
-                    if (dels.size() == 0) {
+                    if (dels.isEmpty()) {
                         continue;
                     }
                     parent.put("sons", dels);
@@ -1569,4 +1609,54 @@
         return AjaxResult.success(map);
     }
 
+
+
+    /**
+     * 鎬绘淇敼澶囨敞
+     *
+     * @return
+     */
+    @GetMapping ("/getzongjianyishengchakanyichangxiangmu")
+    @ApiOperation (value = "鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛")
+    public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
+        if (StrUtil.isNotBlank(tjNum)) {
+            return zongjianyishengchakanyichangxiangmu(tjNum);
+        }
+        return AjaxResult.error();
+    }
+
+    private AjaxResult zongjianyishengchakanyichangxiangmu(String tjNumber) {
+        asyncService.updateCheckType(tjNumber);
+        TjOrder one = orderService.getOrderByTjNum(tjNumber);
+
+        if (one == null) {
+            return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
+        }
+        List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
+        List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
+        List<Map<String, Object>> list = new ArrayList<>();
+        if (null != remarkList && !remarkList.isEmpty()) {
+            for (TjOrderRemark remark : remarkList) {
+                Map<String, Object> parent = new HashMap<>();
+                if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
+                    List<TjOrderDetail> dels = new ArrayList<>();
+                    for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
+                        if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
+                            dels.add(tjOrderDetail);
+                        }
+                    }
+                    if(!dels.isEmpty()){
+                        parent.put("proName",remark.getProName());
+                        parent.put("sone",dels);
+                        list.add(parent);
+                    }
+                } else {
+                    return AjaxResult.success("璇ヤ汉鍛樻棤寮傚父椤圭洰");
+                }
+            }
+            return AjaxResult.success(list);
+        }
+        return AjaxResult.success("璇ヤ汉鍛樻病鏈変綋妫�椤圭洰鏁版嵁锛�");
+    }
+
 }

--
Gitblit v1.8.0