去除非空返回错误

zhaowenxuan

2025-02-11 b4ac803e1554f70e556d94a1313d6944e5fc0e6f

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

@@ -106,6 +106,8 @@
    private IDictHospService dictHospService;
    @Autowired
    private ITjReportPrintService printService;
    @Autowired
    private TjOrderYcxmService ycxmService;

    @GetMapping("/savePdf")
    @ApiOperation(value = "从本地存储模板到数据库")
@@ -383,19 +385,19 @@
                    tjOrderService.update(updateWrapper);
                    return AjaxResult.success("已生成报告！可直接点击预览！");
                }
                String hisRegistrationId = tjOrder.getCardId();
                Date createTime = tjOrder.getCreateTime();
                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                String ksrq = dateFormat.format(createTime);
                String jsrq = dateFormat.format(new Date());
                HashMap<String, Object> params = new HashMap<>();
                params.put("his_registration_id", hisRegistrationId);
                params.put("ksbm", "");
                params.put("pationid", "");
                params.put("ksrq", ksrq);
                params.put("jsrq", jsrq);
                params.put("pagecount", 100);
                params.put("page", 1);
//                String hisRegistrationId = tjOrder.getCardId();
//                Date createTime = tjOrder.getCreateTime();
//                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//                String ksrq = dateFormat.format(createTime);
//                String jsrq = dateFormat.format(new Date());
//                HashMap<String, Object> params = new HashMap<>();
//                params.put("his_registration_id", hisRegistrationId);
//                params.put("ksbm", "");
//                params.put("pationid", "");
//                params.put("ksrq", ksrq);
//                params.put("jsrq", jsrq);
//                params.put("pagecount", 100);
//                params.put("page", 1);
                LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
                wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
                TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
@@ -2167,6 +2169,7 @@
            one.setPrintLastTime(null);
            one.setDownloadLastTime(null);
            if (tjOrderService.updateById(one)) {
//                ycxmService.delOrderYcXmJyByTjh(tjNumber);
                return AjaxResult.success("撤回成功！");
            }
        }
@@ -2220,8 +2223,8 @@
        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.ne(TjOrder::getTjType, "2");
//        wq2.in(TjOrder::getStatus, 401, 402);
        final List<TjOrder> list = tjOrderService.list(wq2);

        for (TjOrder tjOrder : list) {
@@ -2580,16 +2583,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());