zjh
2024-06-26 33de5e90c14e44e1639c961a48e338c1da3d5624
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -1450,6 +1450,7 @@
                    LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
                    queryWrapper.in(LtkjJianchajianyanTree::getSqdh, sqdhs)
                            .in(LtkjJianchajianyanTree::getXmfl, xmfls)
                            .eq(LtkjJianchajianyanTree::getCardId,tjOrder.getCardId())
                            .groupBy(LtkjJianchajianyanTree::getType)
                            .select(LtkjJianchajianyanTree::getFyhj);
                    List<LtkjJianchajianyanTree> results = ltkjJianchajianyanTreeService.list(queryWrapper);
@@ -1605,6 +1606,7 @@
            return AjaxResult.success("该用户暂时没有体检数据");
        }
        List<TjOrderDetail> tjOrderDetails = detailService.getTjOrderDetailListInProParentIdList(String.valueOf(one.getOrderId()), proParentIdList);
        List<TjOrderDetail> tjOrderDetailList=new ArrayList<>();
        TjCustomer customer = tjCustomerService.getById(one.getUserId());
        if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
            for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
@@ -1680,6 +1682,7 @@
                } else {
                    tjOrderDetail.setDoctorName(null);
                }
                tjOrderDetailList.add(tjOrderDetail);
            }
        }
        Map<String, Object> map = new HashMap<>();
@@ -1699,7 +1702,7 @@
        } else {
            map.put("xiaoJieIds", null);
        }
        map.put("sons", tjOrderDetails);
        map.put("sons", tjOrderDetailList);
        map.put("xiaoJie", adviceList);
        map.put("remark", remark.getRemark());