列表重大阳性标记

lige

2023-12-05 f7200af79bd10609f00a63587aff2586dc948cee

列表重大阳性标记

 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java

@@ -651,7 +651,8 @@
            wq1.eq(TjSampling::getTjNum,tjNum);
            wq1.in(TjSampling::getProId,collect);
            List<TjSampling> list = samplingService.list(wq1);
            if(null !=list && list.size()>0) samplingService.removeByIds(list.stream().map(TjSampling::getId).collect(Collectors.toList()));
            if (null != list && list.size() > 0)
                samplingService.removeByIds(list.stream().map(TjSampling::getId).collect(Collectors.toList()));
            LambdaQueryWrapper<TjSampling>wq2=new LambdaQueryWrapper<>();
            wq2.eq(TjSampling::getTjNum,tjNum);
            wq2.eq(TjSampling::getProId,refundPro.getProId());
@@ -1103,6 +1104,7 @@
        }
        return dictSfxms;
    }

    private List<TjOrder> extracted(Integer type, List<TjOrder> list) {
        List<TjOrder> list1=new ArrayList<>();
        for (TjOrder order : list) {
@@ -1112,8 +1114,10 @@
                order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
                order.setGrMoBanId(reportService.getGrMoBanIds());
                order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
                if(null!=tjCustomer.getCusPhone())order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
                if(null!=tjCustomer.getCusIdcard())order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
                if (null != tjCustomer.getCusPhone())
                    order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
                if (null != tjCustomer.getCusIdcard())
                    order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
            }
            String firmId = order.getFirmId();
            if (firmId != null && null != compService.selectDictCompByDrugManufacturerId(String.valueOf(order.getFirmId()))) {
@@ -1142,6 +1146,7 @@
        }
        return list1;
    }

    private void getTjPackageListsByMan(List<TjPackage> tjPackageList) {
        if (null != tjPackageList && tjPackageList.size() > 0) {
            for (TjPackage aPackage : tjPackageList) {
@@ -1185,6 +1190,7 @@
            redisCache.setCacheMapValue("getTjPackageListBySex","getTjPackageListByMan",tjPackageList);
        }
    }

    private void getTjPackageListByWoMan(List<TjPackage> tjPackageList) {
        if (null != tjPackageList && tjPackageList.size() > 0) {
            for (TjPackage aPackage : tjPackageList) {
@@ -1228,6 +1234,7 @@
            redisCache.setCacheMapValue("getTjPackageListBySex","getTjPackageListByWoMan",tjPackageList);
        }
    }

    private void getTjPackageListByManAndWoMan(List<TjPackage> tjPackageList) {
        if (null != tjPackageList && tjPackageList.size() > 0) {
            for (TjPackage aPackage : tjPackageList) {
@@ -1259,6 +1266,7 @@
            redisCache.setCacheMapValue("getTjPackageListBySex","getTjPackageListByManAndWoMan",tjPackageList);
        }
    }

    //已检
    public List<TjCustomer> getYjAjaxResult(List<Long> ksproList) {
        List<TjCustomer> customerLis = new ArrayList<>();
@@ -1290,6 +1298,14 @@

                    TjCustomer customer = tjCustomerService.getById(order.getUserId());
                    if (null != customer) {
                        //遍历项目 判断是否有重大阳性  标记
                        for (TjOrderDetail tjOrderDetail11 : lists) {
                            customer.setIsPositive(tjOrderDetail11.getIsPositive());
                            if (tjOrderDetail11.getIsPositive()==1){
                                break;
                            }
                        }

                        customer.setCusName(hideCusName(customer.getCusName()));
                        customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
                        customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
@@ -1324,6 +1340,7 @@
        }
        return customerLis;
    }

    //未检
    public List<TjCustomer> getWjAjaxResult(List<Long> ksproList) {
        List<TjCustomer> customerLis = new ArrayList<>();
@@ -1344,8 +1361,24 @@
                    if(null ==order){
                        continue;
                    }

                    TjCustomer customer = tjCustomerService.getById(order.getUserId());

                    if (null != customer) {
                        LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
                        qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
                        qww.isNotNull(TjOrderDetail::getFlowingWaterId);
                        List<TjOrderDetail> lists = tjOrderDetailService.list(qww);
                        if (null != lists) {
                            //遍历项目 判断是否有重大阳性  标记
                            for (TjOrderDetail tjOrderDetail11 : lists) {
                                customer.setIsPositive(tjOrderDetail11.getIsPositive());
                                if (tjOrderDetail11.getIsPositive()==1){
                                    break;
                                }
                            }
                        }

                        customer.setCusName(hideCusName(customer.getCusName()));
                        customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
                        customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
@@ -1381,6 +1414,7 @@
        }
        return customerLis;
    }

    //已审
    private List<TjCustomer> getYsResult(String config) {
        List<TjOrder> orderList = null;
@@ -1397,6 +1431,7 @@
                    if (customer == null) {
                        continue;
                    }

                    customer.setCusName(hideCusName(customer.getCusName()));
                    customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
                    customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
@@ -1420,6 +1455,7 @@
        }
        return customerList;
    }

    //未审
    private List<TjCustomer> getWsResult(String config) {
        List<TjOrder> orderList = null;
@@ -1459,6 +1495,7 @@
        }
        return customerList;
    }

    //总检点击体检信息详情
    private List<Map<String, Object>> getAjaxResult(String tjNumber) {
        List<Map<String, Object>> list = new ArrayList<>();
@@ -1524,6 +1561,7 @@
        }
        return list;
    }

    //已签收/未签收
    private List<Map<String, Object>>  getYWqsResult(int a) {
        LambdaQueryWrapper<TjSampling>wq=new LambdaQueryWrapper<>();
@@ -1561,6 +1599,7 @@
        }
        return arrayList;
    }

    /**
     * 隐藏手机号
     *
@@ -1589,6 +1628,7 @@
        }
        return sb.toString();
    }

    /**
     * 隐藏身份证号码
     *
@@ -1620,6 +1660,7 @@
        }
        return sb.toString();
    }

    /**
     * 隐藏用户姓名
     *
@@ -1646,6 +1687,7 @@
        }
        return cusName;
    }

    //临时表添加单项
    public void saveRedisTransitionByProId(String cusId, List<Long> proIds) {
        for (Long proId : proIds) {
@@ -1656,6 +1698,7 @@
            transitionService.saveRedisTransitionByProId(cusId,proId);
        }
    }

    //向缓存中添加 父项目的子项目详情
    private Map<String, Object> getOrderDetailByProParentId(String proParentId, String tjNumber) {
        TjOrderRemark remark = orderRemarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);

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

@@ -155,6 +155,15 @@
                wqs.in(TjOrderRemark::getType, 0,3);
                List<TjOrderRemark> lists = remarkService.list(wqs);
                TjCustomer customer = customerService.getById(order.getUserId());

                //遍历项目 判断是否有重大阳性  标记
                for (TjOrderDetail tjOrderDetail11 : list) {
                    customer.setIsPositive(tjOrderDetail11.getIsPositive());
                    if (tjOrderDetail11.getIsPositive()==1){
                        break;
                    }
                }

                customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
                customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
                customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
@@ -184,6 +193,7 @@
                customer.setTjNumber(order.getTjNumber());
                customer.setOrderId(order.getOrderId());
                customer.setIsHz(order.getIsHz());

                customerLis.add(customer);

            }
@@ -216,6 +226,13 @@
                            List<TjOrderDetail> list111 = Optional.ofNullable(detailService.getTjOrderDetailListByOrderId(String.valueOf(order.getOrderId()))).get();
                            if (list111.size() == 0) {
                                continue;
                            }
                            //遍历项目 判断是否有重大阳性  标记
                            for (TjOrderDetail tjOrderDetail11 : list111) {
                                customer.setIsPositive(tjOrderDetail11.getIsPositive());
                                if (tjOrderDetail11.getIsPositive()==1){
                                    break;
                                }
                            }
                            List<TjOrderRemark> lists = remarkService.getTjOrderRemarkListByYjNum(order.getTjNumber());
                            if (null != lists && lists.size() > 0) {
@@ -348,6 +365,13 @@
                wqs.in(TjOrderRemark::getType, 0,3);
                List<TjOrderRemark> lists = remarkService.list(wqs);
                TjCustomer customer = customerService.getById(order.getUserId());
                //遍历项目 判断是否有重大阳性  标记
                for (TjOrderDetail tjOrderDetail11 : list) {
                    customer.setIsPositive(tjOrderDetail11.getIsPositive());
                    if (tjOrderDetail11.getIsPositive()==1){
                        break;
                    }
                }
                customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
                customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
                customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
@@ -410,6 +434,13 @@
                            if (list111.size() == 0) {
                                continue;
                            }
                            //遍历项目 判断是否有重大阳性  标记
                            for (TjOrderDetail tjOrderDetail11 : list111) {
                                customer.setIsPositive(tjOrderDetail11.getIsPositive());
                                if (tjOrderDetail11.getIsPositive()==1){
                                    break;
                                }
                            }
                            List<TjOrderRemark> lists = remarkService.getTjOrderRemarkListByYjNum(order.getTjNumber());
                            if (null != lists && lists.size() > 0) {
                                StringBuilder stringBuilder = new StringBuilder();

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

@@ -298,6 +298,9 @@
    @TableField(exist = false)
    private Integer isHz;

    @TableField(exist = false)
    private Long isPositive;


    @Override
    public String toString() {