yxh
昨天 8c215c8be0f5076e8c95daf1b2203440ca7dfcad
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
@@ -297,13 +297,23 @@
        Boolean i = null;
        for (ServiceDonateorgan serviceDonateorgan : serviceDonateorganList) {
            log.info("捐献器官移植id是否为空 : {},基础表的id为 : {}", serviceDonateorgan.getId(), serviceDonateorgan.getInfoid());
            // 2026-10-22:同一案例、同一器官只保留一条未删除记录——已存在则更新,避免重复插入
            ServiceDonateorgan query = new ServiceDonateorgan();
            query.setInfoid(serviceDonateorgan.getInfoid());
            query.setOrganno(serviceDonateorgan.getOrganno());
            query.setDel_flag(0);
            List<ServiceDonateorgan> exist = serviceDonateorganService.queryList(query);
            if (!CollectionUtils.isEmpty(exist)) {
                serviceDonateorgan.setId(exist.get(0).getId());
            }
            if (serviceDonateorgan.getId() == null) {
                i = serviceDonateorganService.save(serviceDonateorgan);
            } else {
                i = serviceDonateorganService.updateById(serviceDonateorgan);
            }
        }
        return toAjax(i);
        // 回传带主键的列表,便于前端回填 id
        return AjaxResult.success(serviceDonateorganList);
    }
}