zjh 2023/09/13---5

zjh

2023-09-13 4f53785c3f435d49829782bbbc5cc5ffd96ed9b9

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

@@ -132,7 +132,7 @@
    /**
     * 查询体检记录列表
     */
    @PreAuthorize("@ss.hasPermi('hosp:order:list')")
//    @PreAuthorize("@ss.hasPermi('hosp:order:list')")
    @GetMapping("/list")
    @ApiOperation(value = "查询体检记录列表(默认)")
    public TableDataInfo list(TjOrder tjOrder) {
@@ -703,7 +703,7 @@
    /**
     * 导出体检记录列表
     */
    @PreAuthorize("@ss.hasPermi('hosp:order:export')")
//    @PreAuthorize("@ss.hasPermi('hosp:order:export')")
    @Log(title = "体检记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    @ApiOperation(value = "导出体检记录列表")
@@ -717,7 +717,7 @@
    /**
     * 获取体检记录详细信息
     */
    @PreAuthorize("@ss.hasPermi('hosp:order:query')")
//    @PreAuthorize("@ss.hasPermi('hosp:order:query')")
    @GetMapping(value = "/{orderId}")
    @ApiOperation(value = "获取体检记录详细信息")
    public AjaxResult getInfo(@PathVariable("orderId") Long orderId) {
@@ -858,7 +858,9 @@

            //个人
            if ("2".equals(tjOrder.getTjType())) {
                asyncService.extracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
//                asyncService.extracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);

                asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
            }
            return AjaxResult.success(tjNumber);
        }
@@ -869,7 +871,7 @@
    /**
     * 修改体检记录
     */
    @PreAuthorize("@ss.hasPermi('hosp:order:edit')")
//    @PreAuthorize("@ss.hasPermi('hosp:order:edit')")
    @Log(title = "体检记录", businessType = BusinessType.UPDATE)
    @PutMapping
    @ApiOperation(value = "修改体检记录")
@@ -880,7 +882,7 @@
    /**
     * 删除体检记录
     */
    @PreAuthorize("@ss.hasPermi('hosp:order:remove')")
//    @PreAuthorize("@ss.hasPermi('hosp:order:remove')")
    @Log(title = "体检记录", businessType = BusinessType.DELETE)
    @DeleteMapping("/{orderIds}")
    @ApiOperation(value = "删除体检记录")
@@ -959,15 +961,17 @@
                                    TbTransition tbTransition = new TbTransition();
                                    tbTransition.setCusId(cusId);
                                    tbTransition.setPacId(pacId);
                                    if (null != tjProject.getProPrice()) {
                                        tbTransition.setOrdPrice(tjProject.getProPrice());
                                    } else {
                                        tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
                                    }
//                                    if (null != tjProject.getProPrice()) {
//                                        tbTransition.setOrdPrice(tjProject.getProPrice());
//                                    } else {
//                                        tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
//                                    }
                                    if (null != tjPackageProject.getPriceNow() && divide.compareTo(BigDecimal.valueOf(0)) > 0) {
                                        tbTransition.setNowPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_UP));
                                        tbTransition.setNowPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
                                        tbTransition.setOrdPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
                                    } else {
                                        tbTransition.setNowPrice(BigDecimal.valueOf(0.00));
                                        tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
                                    }
                                    tbTransition.setParentProId(project.getProId());
                                    tbTransition.setParentProName(project.getProName());
@@ -1323,8 +1327,11 @@
                        tbTransition.setPacPrice(projectService.getTjProjectById(String.valueOf(tbTransition.getParentProId())).getProPrice());
                    }
                }
                map.put("ordPrice", money1.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
                map.put("nowPrice", money2.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
//                map.put("ordPrice", money1.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
//                map.put("nowPrice", money2.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));

                map.put("ordPrice", money1);
                map.put("nowPrice", money2);
            }
            list.add(map);
        }
@@ -1531,4 +1538,14 @@
        }
        return AjaxResult.success(aaa);
    }


    @PostMapping("/deletedTbTransitionByCusId")
    @ApiOperation(value = "根据身份证号删除临时表数据")
    public AjaxResult deletedTbTransitionByCusId(@RequestParam @ApiParam(value = "身份证号") String cusId) {
        LambdaQueryWrapper<TbTransition> wq=new LambdaQueryWrapper<>();
        wq.between(TbTransition::getCreateTime,transitionService.getTbTransitionCreateTimeByCusId(cusId),new Date());
        wq.eq(TbTransition::getCusId,cusId);
        return AjaxResult.success(transitionService.remove(wq));
    }
}