20241213

zhaowenxuan

2024-12-13 5a6e758cf00bd4117c3d65b0e13e5389db289c36

20241213

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

@@ -25,6 +25,7 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.symmetric.DES;
import cn.hutool.extra.pinyin.PinyinUtil;
import cn.hutool.json.JSONArray;
@@ -416,12 +417,19 @@
                                   @ApiParam(value = "登记开始时间") @RequestParam(required = false) Date djbeginTime,
                                   @ApiParam(value = "登记结束时间") @RequestParam(required = false) Date djendTime,
                                   @ApiParam(value = "报告开始时间") @RequestParam(required = false) Date bgbeginTime,
                                   @ApiParam(value = "报告结束时间") @RequestParam(required = false) Date bgendTime) {
                                   @ApiParam(value = "报告结束时间") @RequestParam(required = false) Date bgendTime,
                                   @ApiParam(value = "单位") @RequestParam(required = false) String dw) {
        Map<String, Object> map = new HashMap<>();
        if (null != name) {
            List<TjCustomer> customerList;
            LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
            wqq.like(TjCustomer::getCusName, name);
            List<TjCustomer> customerList = tjCustomerService.list(wqq);
            if (StrUtil.isNotBlank(dw)){
                wqq.like(TjCustomer::getCompName,dw);
                customerList = tjCustomerService.list(wqq);
            }else {
                customerList = tjCustomerService.list(wqq);
            }
            if (null != customerList && !customerList.isEmpty()) {
                List<TjOrder> list = new ArrayList<>();
                for (TjCustomer customer : customerList) {
@@ -480,6 +488,75 @@
                map.put("list", collect);
                return AjaxResult.success(map);
            }
            else {
                if (StrUtil.isNotBlank(dw)){
                    wqq = new LambdaQueryWrapper<>();
                    wqq.like(TjCustomer::getCusName, name);
                    customerList = tjCustomerService.list(wqq);
                    LambdaQueryWrapper<DictComp> wrapper = new LambdaQueryWrapper<>();
                    wrapper.like(DictComp::getCnName,dw);
                    List<String> list = iDictCompService.list(wrapper).stream().map(DictComp::getCnName).collect(Collectors.toList());
                    if (null != customerList && !customerList.isEmpty()) {
                        List<TjOrder> list1 = new ArrayList<>();
                        for (TjCustomer customer : customerList) {
                            LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
                            if (null != djbeginTime && null != djendTime) {
                                wq.between(TjOrder::getCreateTime, DateUtil.beginOfDay(djbeginTime), DateUtil.endOfDay(djendTime));
                                wq.in(TjOrder::getFirmId, list);
                            }
                            wq.eq(TjOrder::getUserId, customer.getCusId());
                            list1.addAll(tjOrderService.list(wq));
                        }
                        List<TjOrder> collect = null;
                        if (!list1.isEmpty()) {
                            for (TjOrder order : list1) {
                                TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
                                if (null != tjCustomer) {
//                            order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
                                    order.setTjCustomerName(tjCustomer.getCusName());
//                            order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
                                    order.setTjCustomerPhone(tjCustomer.getCusPhone());
//                            order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
                                    order.setTjCusIdCard(tjCustomer.getCusIdcard());
                                    order.setTjCustomerSex(tjCustomer.getCusSex());
                                    order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
                                    order.setCareer(tjCustomer.getCareer());
                                    order.setIdType(tjCustomer.getIdType());
                                    order.setAgeUnit(tjCustomer.getAgeUnit());
                                    order.setTjCount(String.valueOf(tjCustomer.getCusNumber()));
                                    if (null != tjCustomer.getCompName()) {
                                        order.setDictCompName(tjCustomer.getCompName());
                                    } else {
                                        String firmId = order.getFirmId();
                                        if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
                                            order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName());
                                        }
                                    }

                                    if (null != order.getPacId()) {
                                        if (null != tjPackageService.getById(order.getPacId())) {
                                            order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
                                        }
                                        if (null != dwDeptService.getById(order.getPacId())) {
                                            order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
                                        }
                                    }
                                    TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber());
                                    if (null != dycs) order.setDycs(Math.toIntExact(dycs.getDycs()));
                                }
                            }
                            collect = list1.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
                        }
                        if (null != collect) {
                            map.put("total", collect.size());
                        } else {
                            map.put("total", 0);
                        }
                        map.put("list", collect);
                        return AjaxResult.success(map);
                    }
                }
            }

        }
        Page<TjOrder> page1 = new Page<>(pageNum, pageSize);
@@ -497,6 +574,13 @@

        if (null != xmmc) {
            wq.in(TjOrder::getTjNumber, projectService.getTjNumLIstByXmmx(xmmc));
        }

        if (StrUtil.isNotBlank(dw)){
            LambdaQueryWrapper<DictComp> wrapper = new LambdaQueryWrapper<>();
            wrapper.like(DictComp::getCnName,dw);
            List<String> list = iDictCompService.list(wrapper).stream().map(DictComp::getDrugManufacturerId).collect(Collectors.toList());
            wq.in(TjOrder::getFirmId,list);
        }

        wq.orderByDesc(TjOrder::getCreateTime);
@@ -533,6 +617,37 @@
                    TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber());
                    if (null != dycs) order.setDycs(Math.toIntExact(dycs.getDycs()));
                }
                    int czwj = remarkService.panduaniscunzaiweijian(order.getTjNumber());
                    int sfwc = remarkService.panduaniswancheng(order.getTjNumber());
                    Date checkTime = order.getCheckTime();
                    Date reportTime = order.getReportTime();
                    Integer heshouStatus = order.getHeshouStatus();
                    Date lastTime = order.getPrintLastTime();
                    if (czwj == 0) {
                        //未检
                        order.setZt("未检");
                    } else if (czwj > 0) {
                        //在检
                        order.setZt("在检");
                    } else if (sfwc == 0) {
                        //已完成
                        order.setZt("已完成");
                    } else if (null != checkTime) {
                        //已审核
                        order.setZt("已审核");
                    } else if (null != reportTime) {
                        //生成报告
                        order.setZt("生成报告");
                    } else if (null != heshouStatus) {
                        //报告核收
                        order.setZt("报告核收");
                    } else if (null != lastTime) {
                        //已出报告
                        order.setZt("已出报告");
                    } else {
                        order.setZt("未检");
                    }

            }
        }
        map.put("list", list);
@@ -609,6 +724,7 @@
                } else {
                    map.put("total", 0);
                }
                if (collect == null) collect = new ArrayList<>();
                map.put("list", collect);
                return AjaxResult.success(map);
            }

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java

@@ -451,6 +451,10 @@
    @TableField(exist = false)
    private Integer dycs;


    @TableField(exist = false)
    private String zt;

    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)