20250106

zjh

2025-01-06 d5cd702a6985a208dae4a2e532c984252fbca4d4

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

@@ -2580,16 +2580,14 @@

    @GetMapping("/tuanDuiYiChangBySex")
    @ApiOperation(value = "生成团队体检报告——男女异常结果统计")
    public Map<String, List<Map<String, Object>>> tuanDuiYiChangBySex(@ApiParam(value = "单位") @RequestParam String firmId,
                                                                      @ApiParam(value = "部门") @RequestParam String firmDeptId) {
    public Map<String, List<Map<String, Object>>> tuanDuiYiChangBySex(@ApiParam(value = "单位") @RequestParam String dwname) {

        Map<String, List<Map<String, Object>>> all = new HashMap<>();

        LambdaQueryWrapper<TjOrder> wq2 = new LambdaQueryWrapper<>();
        wq2.eq(TjOrder::getFirmId, firmId);
        wq2.eq(TjOrder::getFirmDeptId, firmDeptId);
        wq2.eq(TjOrder::getTjType, "1");
        wq2.in(TjOrder::getStatus, 401, 402);
        wq2.eq(TjOrder::getFirmName,dwname);
        wq2.ne(TjOrder::getTjType, "2");
//        wq2.in(TjOrder::getStatus, 401, 402);
        final List<TjOrder> list = tjOrderService.list(wq2);

        List<String> tjNumberList = list.stream().map(TjOrder::getTjNumber).collect(Collectors.toList());