20250103

zhaowenxuan

2025-01-03 dbc11598957806965ec0e6b15c91f3d017d5759f

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSamplingServiceImpl.java

@@ -157,18 +157,18 @@

    @Transactional
    @Override
    public AjaxResult mergeCaiYangTran(List<String> ids) {
        return mergeCaiYang(ids);
    public AjaxResult mergeCaiYangTran(List<String> ids,String prefix) {
        return mergeCaiYang(ids,prefix);
    }

    @Override
    public String mergeCaiYangApi(List<String> ids) {
        AjaxResult ajaxResult = mergeCaiYang(ids);
    public String mergeCaiYangApi(List<String> ids,String prefix) {
        AjaxResult ajaxResult = mergeCaiYang(ids,prefix);
        log.info("合并采样返回 ->{}",ajaxResult);
        return ajaxResult.get("data").toString();
    }

    private AjaxResult mergeCaiYang(List<String> ids) {
    private AjaxResult mergeCaiYang(List<String> ids,String prefix) {
        if (null != ids && !ids.isEmpty()) {
            if(ids.size()==1) return AjaxResult.error("请选择至少两条项目进行合并!");
            int i = panduanshifoukeyihebing(ids);
@@ -193,7 +193,7 @@
                sampling.setProId(proId);
                sampling.setProName(proName);
                sampling.setIsMerge(1);
                sampling.setJyxh(idUtils.generateLisID());
                sampling.setJyxh(idUtils.generateLisID(prefix));
                if (save(sampling)) {
                    if (updateHeBingXm(ids, sampling.getId())) {
                        return AjaxResult.success("合并项目成功!", sampling.getId());