zjh 2023/11/01--2

zjh

2023-11-01 11a7f9174d77eae87e45c43668e9746139dca036

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java

@@ -540,7 +540,8 @@
            return AjaxResult.success("操作失败");
        }
        for (TjOrderRemark orderRemark : remarklList) {
            if (null != orderRemark.getSummaryList()) {
            List<String> summaryList = orderRemark.getSummaryList();
            if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null) ) {
                orderRemark.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
            }
            LambdaQueryWrapper<TjOrder> qw = new LambdaQueryWrapper<>();
@@ -581,7 +582,6 @@
                        }
                    }
                }
                //-----------------------------------end
                asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order);
                LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
                qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
@@ -600,7 +600,7 @@
                    remarkService.save(remark);
                } else {
                    one.setRemark(orderRemark.getRemark());
                    if (orderRemark.getSummaryList() != null) {
                    if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null)) {
                        one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
                    }
                    one.setDeptId(orderRemark.getDeptId());
@@ -608,9 +608,12 @@
                    one.setType(1);
                    remarkService.updateById(one);
                }
                asyncService.updateCheckType(orderRemark.getTjNumber());
                asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
                return AjaxResult.success("操作成功");
            }
            asyncService.updateCheckType(orderRemark.getTjNumber());
            asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
        }
        return AjaxResult.success("操作成功");
    }
@@ -700,13 +703,24 @@
    @ApiOperation("点击父项目显示子项目详情")
    public AjaxResult getOrderDetailByProParentId(@ApiParam(value = "父项目id") @RequestParam String proParentId,
                                                  @ApiParam(value = "体检号") @RequestParam String tjNumber) {
        TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);
        if (null == SecurityUtils.getLoginUser().getUserId() || null == userService.getById(SecurityUtils.getLoginUser().getUserId())) {
            return AjaxResult.error("获取用户信息错误");
        }

//        if(redisCache.hasHKey("getOrderDetailByProParentId"+tjNumber,proParentId)){
//            Map<String, Object> mapValue = redisCache.getCacheMapValue("getOrderDetailByProParentId" + tjNumber, proParentId);
//            return AjaxResult.success(mapValue);
//        }

        TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);
        List<TjProject> proParentList = projectService.getTjProjectListBySoneId(proParentId);
        if (null == proParentList) {
            return AjaxResult.error("该项目下暂时没数据");
        if (null == proParentList || proParentList.size()==0) {
            Map<String, Object> map = new HashMap<>();
            map.put("xiaoJieIds", null);
            map.put("sons", projectService.list(new LambdaQueryWrapper<TjProject>().eq(TjProject::getProId,proParentId)));
            map.put("xiaoJie", null);
            map.put("remark", remark.getRemark());
            return AjaxResult.success(map);
        }
        List<Long> proParentIdList = proParentList.stream().map(TjProject::getProId).collect(Collectors.toList());
        TjOrder one = orderService.getOrderByTjNum(tjNumber);
@@ -719,16 +733,17 @@
            for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                TjProject project = projectService.getById(tjOrderDetail.getProId());
                //病种回显
                LambdaQueryWrapper<TjOrderDetailRules> wq=new LambdaQueryWrapper<>();
                wq.eq(TjOrderDetailRules::getProId,project.getProId());
                wq.eq(TjOrderDetailRules::getTjNumber,tjNumber);
                List<TjOrderDetailRules> list = tjOrderDetailRulesService.list(wq);
                List<TjRules> res=new ArrayList<>();
                for (TjOrderDetailRules orderDetailRules : list) {
                    final TjRules byId = tjRulesService.getById(orderDetailRules.getAid());
                    res.add(byId);
                }
                tjOrderDetail.setRulesList(res);
//                LambdaQueryWrapper<TjOrderDetailRules> wq=new LambdaQueryWrapper<>();
//                wq.eq(TjOrderDetailRules::getProId,project.getProId());
//                wq.eq(TjOrderDetailRules::getTjNumber,tjNumber);
//                List<TjOrderDetailRules> list = tjOrderDetailRulesService.list(wq);
//                List<TjRules> res=new ArrayList<>();
//                for (TjOrderDetailRules orderDetailRules : list) {
//                    final TjRules byId = tjRulesService.getById(orderDetailRules.getAid());
//                    res.add(byId);
//                }
                List<TjRules> rulesList = tjRulesService.getTjRulesListByTjNumAndProId(tjNumber, tjOrderDetail.getProId());
                tjOrderDetail.setRulesList(rulesList);

                //查标准和单位----start
                List<TjStandard> list26 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
@@ -790,10 +805,14 @@
        List<TjAdvice> adviceList = new ArrayList<>();
        if (null != remark) {
            String[] strings = StringUtils.split(remark.getSummary(), ";");
            if (null != strings && strings.length > 0) {
                for (String string : strings) {
                    adviceList.add(tjAdviceService.getById(string));
                }
//            if (null != strings && strings.length > 0) {
//                for (String string : strings) {
//                    adviceList.add(tjAdviceService.getById(string));
//                }
//            }
            if(null !=strings && strings.length>0){
                List<TjAdvice> list = tjAdviceService.getAdviceStringByIds(strings);
                adviceList.addAll(list);
            }
            map.put("xiaoJieIds", StringUtils.split(remark.getSummary(), ";"));
        } else {
@@ -802,6 +821,8 @@
        map.put("sons", tjOrderDetails);
        map.put("xiaoJie", adviceList);
        map.put("remark", remark.getRemark());

//        asyncService.getOrderDetailByProParentId(tjNumber,map,proParentId);
        return AjaxResult.success(map);
    }