修改判断是否需要lis、pacs

zhaowenxuan

2024-10-14 7d702f59202496e28a80582b4aeeab2a9b9da76d

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

@@ -157,6 +157,7 @@
    @ApiOperation(value = "查询体检预约列表接口(默认)")
    public TableDataInfo list(TjReservation tjReservation) {
        startPage();
        tjReservation.setIsExpire(2);
        List<TjReservation> list = tjReservationService.selectTjReservationList(tjReservation);
//        if(null !=list && list.size()>0){
//            for (TjReservation reservation : list) {
@@ -176,12 +177,12 @@
    public TableDataInfo selectTjReservationByDelete(TjReservation tjReservation) {
        startPage();
        List<TjReservation> list = tjReservationService.selectTjReservationByDelete(tjReservation);
        if(null !=list && list.size()>0){
            for (TjReservation reservation : list) {
                reservation.setName(MatchUtils.hideCusName(reservation.getName()));
                reservation.setPhoe(MatchUtils.hidePhoneNum(reservation.getPhoe()));
                reservation.setIdCard(MatchUtils.hideIdCardNum(reservation.getIdCard()));
            }
        if(null !=list && !list.isEmpty()){
//            for (TjReservation reservation : list) {
//                reservation.setName(MatchUtils.hideCusName(reservation.getName()));
//                reservation.setPhoe(MatchUtils.hidePhoneNum(reservation.getPhoe()));
//                reservation.setIdCard(MatchUtils.hideIdCardNum(reservation.getIdCard()));
//            }
        }
        return getDataTable(list);
    }
@@ -409,12 +410,19 @@
                            }
                        }
                        for (TjDwGrouping groupingWz : groupingWzs) {
                            if (null != groupingWz && groupingWz.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingWz.getDwDeptId().equals(dwDept.getId())) {
                            if (null != groupingWz  && groupingWz.getDwDeptId().equals(dwDept.getId())) {
                                tjReservation.setGroupingId(groupingWz.getId());
                                tjReservation.setGroupingName(groupingWz.getGroupingName());
                                tjReservation.setYsPrice(groupingWz.getYsPrice());
                                //合计
                                hjMoney = hjMoney.add(groupingWz.getYsPrice()); count+=1;
                                hjMoney = hjMoney.add(groupingWz.getYsPrice());count+=1;
                                if(tjReservation.getSex()==0){
                                    manMoney=manMoney.add(groupingWz.getYsPrice()); manCount+=1;
                                }
                                if(tjReservation.getSex()==1){
                                    woManMoney=woManMoney.add(groupingWz.getYsPrice());woManCount+=1;
                                }

                            }
                        }
                        LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
@@ -434,13 +442,13 @@
                wrongList.add(tjReservation.getName());
            }
        }
        if (yyList.size() > 0) {
        if (!yyList.isEmpty()) {
            map.put("list", yyList);
            map.put("hjMoney", hjMoney);
            return AjaxResult.error("操作失败,以上人员已经预约无需导入!!!", map);
        }

        if (wrongList.size() > 0) {
        if (!wrongList.isEmpty()) {
            map.put("list", wrongList);
            map.put("hjMoney", hjMoney);
            return AjaxResult.error("操作失败, 请认真核对信息后重新导入!!!", map);
@@ -795,7 +803,7 @@
                reservation.setProIds(Joiner.on(",").join(proIds));
                reservation.setReservationTime(DateUtil.parse(reservationTime, "yyyy-MM-dd"));
                reservation.setCompanyId(dwGrouping.getDwId());
                reservation.setCompany(dwGrouping.getDwDeptName());
                reservation.setCompany(dwGrouping.getDwName());
                reservation.setPayType(Long.valueOf(dwGrouping.getPayType()));
                reservation.setPacId(dwDept.getId());
                compPay=compPay.add(dwGrouping.getYsPrice());