zjh 2024-08-08

zjh

2024-08-08 76654b216b0d7a9cdafa01a037a4807204fb51ec

zjh 2024-08-08

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

@@ -177,7 +177,7 @@
            List<TeamTjPeopleVo> voList = new ArrayList<>();
            for (TjReservation reservation : reservationList) {
                TeamTjPeopleVo vo = new TeamTjPeopleVo();
                vo.setName(MatchUtils.hideCusName(reservation.getName()));
                vo.setName(reservation.getName());
                TjCustomer customer = customerService.getOne(new LambdaQueryWrapper<TjCustomer>().eq(TjCustomer::getCusIdcard, reservation.getIdCard()));
                if (null != customer) {
                    TjOrder tjOrder = orderService.getOne(new LambdaQueryWrapper<TjOrder>().eq(TjOrder::getUserId, customer.getCusId()).eq(TjOrder::getTeamNo, teamNo));

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

@@ -109,7 +109,12 @@
            return AjaxResult.error("该性别分组已存在不可重复创建");
        }
        if(null ==tjDwGrouping.getPayType()|| tjDwGrouping.getPayType().equals(""))return AjaxResult.error("请选择结算方式!!!");
        tjDwGrouping.setDwDeptName(compService.getById(tjDwGrouping.getDwId()).getCnName());

        TjDwDept dwDept = dwDeptService.getById(tjDwGrouping.getDwDeptId());
        if(null !=dwDept){
            tjDwGrouping.setDwDeptName(dwDept.getDwDeptName());
        }
        tjDwGrouping.setDwName(compService.getById(tjDwGrouping.getDwId()).getCnName());
        if (tjDwGroupingService.saveOrUpdate(tjDwGrouping)) {
            if(null !=tjDwGrouping.getMapList() && tjDwGrouping.getMapList().size()>0){
//                groupingProService.remove(new LambdaQueryWrapper<TjGroupingPro>().eq(TjGroupingPro::getGroupingId,tjDwGrouping.getId()));

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

@@ -204,7 +204,7 @@
     * 导入团体体检预约列表
     */
    @PostMapping("/newExcelImport")
    @ApiOperation(value = "团体导入 (新版本)")
    @ApiOperation(value = "团体excel表导入")
    @Transactional
    public AjaxResult newExcelImport(@RequestPart(value = "file") @ApiParam(value = "Excel文件") MultipartFile file,
                                     @RequestParam @ApiParam(value = "单位id") String dwId,
@@ -329,7 +329,7 @@
     * 导入团体体检预约列表
     */
    @PostMapping("/newExcelImportNotDwDeptId")
    @ApiOperation(value = "团体导入 (新版本不传单位部门id)")
    @ApiOperation(value = "团体excel表导入 (新版本不传单位部门id)")
    @Transactional
    public AjaxResult newExcelImportNotDwDeptId(@RequestPart(value = "file") @ApiParam(value = "Excel文件") MultipartFile file,
                                     @RequestParam @ApiParam(value = "单位id") String dwId) {
@@ -349,15 +349,15 @@
        List<TjReservation> rightList = new ArrayList<>();
        List<TjReservation> yyList = new ArrayList<>();
        Map<String, Object> map = new HashMap<>();
        TjDwGrouping groupingMan = null;//男
        TjDwGrouping groupingWoMan = null;//女
        TjDwGrouping groupingWz = null;//未知(不分性别)
        List<TjDwGrouping> groupingMans = null;//男
        List<TjDwGrouping> groupingWoMans = null;//女
        List<TjDwGrouping> groupingWzs = null;//未知(不分性别)
        try {
            groupingMan = dwGroupingService.getOne(new LambdaQueryWrapper<TjDwGrouping>().eq(TjDwGrouping::getDwId,dwId)
            groupingMans = dwGroupingService.list(new LambdaQueryWrapper<TjDwGrouping>().eq(TjDwGrouping::getDwId,dwId)
                    .eq(TjDwGrouping::getSex, 0));
            groupingWoMan = dwGroupingService.getOne(new LambdaQueryWrapper<TjDwGrouping>().eq(TjDwGrouping::getDwId,dwId)
            groupingWoMans = dwGroupingService.list(new LambdaQueryWrapper<TjDwGrouping>().eq(TjDwGrouping::getDwId,dwId)
                    .eq(TjDwGrouping::getSex, 1));
            groupingWz = dwGroupingService.getOne(new LambdaQueryWrapper<TjDwGrouping>().eq(TjDwGrouping::getDwId,dwId)
            groupingWzs = dwGroupingService.list(new LambdaQueryWrapper<TjDwGrouping>().eq(TjDwGrouping::getDwId,dwId)
                    .eq(TjDwGrouping::getSex, 2));
        } catch (Exception e) {
            return AjaxResult.error("分组信息有误请重新分组!");
@@ -376,7 +376,7 @@
            String phoe = tjReservation.getPhoe();
            if (null != idCard && null != phoe) {
//                if (!MatchUtils.isIdCard(idCard) || !MatchUtils.isMobileNO(phoe)) {
                if (idCard.isEmpty() || phoe.isEmpty()) {
                if (idCard.isEmpty() || phoe.isEmpty() || null==tjReservation.getDwxm()) {
                    wrongList.add(tjReservation.getName());
                } else {
                    //年龄
@@ -384,8 +384,10 @@
                    //出生日期
                    tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()),"yyyy-MM-dd"));

                    if (null != groupingMan && groupingMan.getSex().equals(String.valueOf(tjReservation.getSex()))) {

                    TjDwDept dwDept = dwDeptService.getOne(new LambdaQueryWrapper<TjDwDept>().eq(TjDwDept::getDwDeptName, tjReservation.getDwxm()));
                    if(null !=dwDept){
                        for (TjDwGrouping groupingMan : groupingMans) {
                            if (null != groupingMan && groupingMan.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingMan.getDwDeptId().equals(dwDept.getId())) {
                        tjReservation.setGroupingId(groupingMan.getId());
                        tjReservation.setGroupingName(groupingMan.getGroupingName());
                        tjReservation.setYsPrice(groupingMan.getYsPrice());
@@ -393,26 +395,28 @@
                        hjMoney = hjMoney.add(groupingMan.getYsPrice()); count+=1;
                        //男组人数
                        manMoney=manMoney.add(groupingMan.getYsPrice()); manCount+=1;
                            }
                        }

                    } else if (null != groupingWoMan && groupingWoMan.getSex().equals(String.valueOf(tjReservation.getSex()))) {

                        for (TjDwGrouping groupingWoMan : groupingWoMans) {
                            if (null != groupingWoMan && groupingWoMan.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingWoMan.getDwDeptId().equals(dwDept.getId())) {
                        tjReservation.setGroupingId(groupingWoMan.getId());
                        tjReservation.setGroupingName(groupingWoMan.getGroupingName());
                        tjReservation.setYsPrice(groupingWoMan.getYsPrice());
                        //合计
                        hjMoney = hjMoney.add(groupingWoMan.getYsPrice()); count+=1;
                        woManMoney=woManMoney.add(groupingWoMan.getYsPrice());woManCount+=1;

                    } else if (null != groupingWz && groupingWz.getSex().equals(String.valueOf(tjReservation.getSex()))) {

                            }
                        }
                        for (TjDwGrouping groupingWz : groupingWzs) {
                            if (null != groupingWz && groupingWz.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingWz.getDwDeptId().equals(dwDept.getId())) {
                        tjReservation.setGroupingId(groupingWz.getId());
                        tjReservation.setGroupingName(groupingWz.getGroupingName());
                        tjReservation.setYsPrice(groupingWz.getYsPrice());
                        //合计
                        hjMoney = hjMoney.add(groupingWz.getYsPrice()); count+=1;

                    }

                        }
                    LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
                    wq.eq(TjReservation::getIdCard, tjReservation.getIdCard());
                    wq.eq(TjReservation::getIsExpire, 2);
@@ -421,6 +425,10 @@
                        yyList.add(one);
                    }
                    rightList.add(tjReservation);
                    }else {
                        wrongList.add(tjReservation.getName());
                    }

                }
            } else {
                wrongList.add(tjReservation.getName());
@@ -435,7 +443,7 @@
        if (wrongList.size() > 0) {
            map.put("list", wrongList);
            map.put("hjMoney", hjMoney);
            return AjaxResult.error("操作失败, 请核对信息后重新导入!!!", map);
            return AjaxResult.error("操作失败, 请认真核对信息后重新导入!!!", map);
        } else {
            map.put("list", rightList);
            map.put("count", count);
@@ -627,7 +635,7 @@


    @PostMapping("/newReservationConfirm")
    @ApiOperation(value = "团体预约确认接口 (新版本)")
    @ApiOperation(value = "团体预约确认接口")
    @Transactional
    @RepeatSubmit
    public AjaxResult newReservationConfirm(@RequestBody ConfirmDto dto) {
@@ -737,4 +745,121 @@
        return AjaxResult.error("请选择预约对象");
    }


    @PostMapping("/newReservationConfirmxbb")
    @ApiOperation(value = "团体预约确认接口 (新版本)")
    @Transactional
    @RepeatSubmit
    public AjaxResult newReservationConfirmxbb(@RequestBody ConfirmDto dto) {
        //预约的所有人
        List<TjReservation> rightList = dto.getReservations();

        //预约时间
        String reservationTime = dto.getReservationTime();
        if (null == reservationTime) {
            return AjaxResult.error("请选择预约时间!");
        }

        Date date = new Date();

        //异步数据
//        asyncService.addNewReservationConfirm(rightList);
        asyncService.saveNewReservationConfirm(rightList);

        //体检单位部门
        DictComp comp = compService.getById(dto.getDwId());

        String teamNo = PinyinUtil.getFirstLetter(comp.getCnName(), "") + DateUtil.format(date, "yyMMddHHmmss");

        //团体人数合计价格
        BigDecimal compPay=new BigDecimal("0.00");

        if (null != rightList && !rightList.isEmpty()) {

            for (TjReservation reservation : rightList) {

                TjDwGrouping dwGrouping = dwGroupingService.getById(reservation.getGroupingId());

                TjDwDept dwDept = dwDeptService.getById(dwGrouping.getDwDeptId());

                LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
                wq.eq(TjReservation::getIdCard, reservation.getIdCard());
                wq.eq(TjReservation::getIsExpire, 2);
                TjReservation one = tjReservationService.getOne(wq);
                if (null != one) {
                    continue;
                }
                LambdaQueryWrapper<TjGroupingPro> wq1 = new LambdaQueryWrapper<>();
                wq1.eq(TjGroupingPro::getGroupingId, reservation.getGroupingId());
                List<String> proIds = groupingProService.list(wq1).stream().map(TjGroupingPro::getProId).collect(Collectors.toList());
                reservation.setProIds(Joiner.on(",").join(proIds));
                reservation.setReservationTime(DateUtil.parse(reservationTime, "yyyy-MM-dd"));
                reservation.setCompanyId(dwGrouping.getDwId());
                reservation.setCompany(dwGrouping.getDwDeptName());
                reservation.setPayType(Long.valueOf(dwGrouping.getPayType()));
                reservation.setPacId(dwDept.getId());
                compPay=compPay.add(dwGrouping.getYsPrice());
                reservation.setTjType(String.valueOf(1));
                reservation.setTeamNo(teamNo);
                reservation.setYxts(dto.getYxts());
                tjReservationService.save(reservation);
                taskService.addTask(new TjReservationTask(reservation.getId(),
                        DateUtil.between(date,DateUtil.endOfDay(DateUtil.offsetDay(reservation.getReservationTime(),dto.getYxts())), DateUnit.MS)));
            }

            LambdaQueryWrapper<TjCompPay> wq0 = new LambdaQueryWrapper<>();
            wq0.eq(TjCompPay::getCompId,dto.getDwId());
            wq0.eq(TjCompPay::getTeamNo, teamNo);
            TjCompPay one = compPayService.getOne(wq0);
            if (null != one) {
                one.setCopeWith(compPay);
                one.setSerialNumber(SecurityUtils.getUsername() + DateUtil.format(date, "yyMMddHHmmssSSS"));
                one.setInvoiceNo("FP" + DateUtil.format(date, "yyMMddHHmmssSSS"));
                one.setPaidIn(new BigDecimal("0.00"));
                compPayService.updateById(one);
            } else {
                TjCompPay tjCompPay = new TjCompPay();
                tjCompPay.setCompId(dto.getDwId());
                tjCompPay.setTeamNo(teamNo);
                tjCompPay.setCopeWith(compPay);
                tjCompPay.setSerialNumber(SecurityUtils.getUsername() + DateUtil.format(date, "yyMMddHHmmssSSS"));
                tjCompPay.setInvoiceNo("FP" + DateUtil.format(date, "yyMMddHHmmssSSS"));
                tjCompPay.setPaidIn(new BigDecimal("0.00"));
                tjCompPay.setDifference(tjCompPay.getCopeWith().subtract(BigDecimal.valueOf(0.00)));
                compPayService.save(tjCompPay);
            }

            Map<String, List<TjReservation>> collect = rightList.stream().collect(Collectors.groupingBy(TjReservation::getPacId));

            if(!collect.isEmpty()){
                for (Map.Entry<String, List<TjReservation>> entry : collect.entrySet()) {
                    LambdaQueryWrapper<TjTeamSelectRecord> wq = new LambdaQueryWrapper<>();
                    wq.eq(TjTeamSelectRecord::getTeamNo, teamNo);
                    wq.eq(TjTeamSelectRecord::getCompId,dto.getDwId());
                    TjTeamSelectRecord recordServiceOne = selectRecordService.getOne(wq);
                    if (null != recordServiceOne) {
                        recordServiceOne.setPacId(entry.getKey());
                        recordServiceOne.setCompId(dto.getDwId());
                        recordServiceOne.setTeamNo(teamNo);
                        recordServiceOne.setTransactionAmount(new BigDecimal("0.00"));
                        recordServiceOne.setCount(entry.getValue().size());
                        recordServiceOne.setDifference(compPay);
                        selectRecordService.updateById(recordServiceOne);
                    }else {
                        TjTeamSelectRecord selectRecord = new TjTeamSelectRecord();
                        selectRecord.setCompId(dto.getDwId());
                        selectRecord.setPacId(entry.getKey());
                        selectRecord.setTeamNo(teamNo);
                        selectRecord.setTransactionAmount(new BigDecimal("0.00"));
                        selectRecord.setCount(entry.getValue().size());
                        selectRecord.setDifference(compPay);
                        selectRecordService.save(selectRecord);
                    }
                }
            }
            return AjaxResult.success("预约成功");
        }
        return AjaxResult.error("请选择预约对象");
    }

}

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

@@ -189,6 +189,17 @@
    @ApiModelProperty("单位名称")
    private String company;

    /**
     * 单位名字
     */
    @ExcelExport(value = "单位项目",sort =99)
    @ExcelImport("单位项目")
    @Excel(name = "单位项目",sort = 99,cellType = Excel.ColumnType.STRING)
    @ApiModelProperty("单位项目")
    @TableField(exist = false)
    private String dwxm;


    @ApiModelProperty("单位id")
    private String companyId;


 ltkj-hosp/src/main/java/com/ltkj/hosp/dto/ConfirmDto.java

@@ -21,6 +21,14 @@
@Data
@ApiModel(value = "团体体检预约参数对象")
public class ConfirmDto {

    /**
     * 单位id
     */
    @ApiModelProperty(value = "单位id")
    private String dwId;


    /**
     * 单位部门id
     */