体检状态判断修改

zhaowenxuan

2024-10-21 aa17e1c55a7093a95f506c0343c6dcfe49d91161

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

@@ -231,7 +231,7 @@
        ArrayList<TjCustomer> tjCustomers = new ArrayList<>();
        for (TjSampling tjSampling : list) {
            TjCustomer customer = customerService.getById(tjSampling.getCusId());
            customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
            customer.setCusName(customer.getCusName());
            customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
            customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
            customer.setTjNumber(tjSampling.getTjNum());
@@ -260,7 +260,6 @@
        wrapper.eq(TjSampling::getCusId, cusId);
        wrapper.eq(TjSampling::getIsSignFor,isSignFor);
        wrapper.and(i -> i.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1));
//        wrapper.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1);
        wrapper.orderByDesc(TjSampling::getIsMerge);
        List<TjSampling> list = tjSamplingService.list(wrapper);
        if (list.isEmpty()){
@@ -268,8 +267,10 @@
            return AjaxResult.error("参数错误,未查询到数据");
        }
        for (TjSampling sampling : list) {
//            sampling.setCusName(MatchUtils.hideCusName(sampling.getCusName()));
            sampling.setCusName(sampling.getCusName());
            TjCustomer customer = customerService.getById(sampling.getCusId());
            TjOrder order = orderService.getOrderByTjNum(sampling.getTjNum());
            if(null !=order)sampling.setCardId(order.getCardId());
            sampling.setCustomer(customer);
        }
        return AjaxResult.success(list);
    }
@@ -287,6 +288,7 @@
            int pdsfczhbxm = tjSamplingService.pdsfczhbxm(ids);
            if (pdsfczhbxm == ids.size()) return AjaxResult.error("多个合并项目不可再继续合并!");
            if (pdsfczhbxm > 1) return AjaxResult.error("最多允许选择一个合并过的项目!");
//            查询出里面不可合并的化验项目
            String string = tjSamplingService.getBuKeHebingProName(ids);
            if(null !=string){
                return AjaxResult.error(string+"这几个项目不可合并!");
@@ -416,7 +418,10 @@
        List<TjSampling> tjSamplings = tjSamplingService.listByIds(ids);
        if (tjSamplings.isEmpty())
            return AjaxResult.error("请选择要确认项");
        String errorMsg = "";
        for (TjSampling sampling : tjSamplings) {
            if (sampling.getJyxmdm() == null)
                errorMsg+=sampling.getProName()+"在lis系统未找到对应编码无法发出申请";
            sampling.setIsSignFor("0");
//                LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
//                wq.eq(TjProject::getProParentId, sampling.getProId());
@@ -468,6 +473,7 @@
                return AjaxResult.error("操作失败请重试");
            }
        }
        if (StrUtil.isNotBlank(errorMsg)) return AjaxResult.error(errorMsg);
        return AjaxResult.success("操作成功");
    }
}