Merge remote-tracking branch 'origin/master'

zhaowenxuan

7 天以前 0892d843cd394f383ff50f480f7f22f2ec3829bc

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

@@ -1,19 +1,14 @@
package com.ltkj.hosp.service.impl;

import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.utils.DateUtils;
import com.ltkj.common.utils.IdUtils;
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.idutil.IdUtils;
import com.ltkj.hosp.service.ITjCustomerService;
import com.ltkj.hosp.service.ITjOrderService;
import lombok.extern.slf4j.Slf4j;
@@ -169,55 +164,59 @@
    }

    private AjaxResult mergeCaiYang(List<String> ids,String prefix) {
        if (null != ids && !ids.isEmpty()) {
            if(ids.size()==1) return AjaxResult.error("请选择至少两条项目进行合并!");
            int i = panduanshifoukeyihebing(ids);
            if (i > 1) {
                return AjaxResult.error("标本类型不一致,不可合并");
            }
            int pdsfczhbxm = pdsfczhbxm(ids);
            if (pdsfczhbxm == ids.size()) return AjaxResult.error("多个合并项目不可再继续合并!");
            if (pdsfczhbxm > 1) return AjaxResult.error("最多允许选择一个合并过的项目!");
//            查询出里面不可合并的化验项目
            String string = getBuKeHebingProName(ids);
            if(null !=string){
                return AjaxResult.error(string + "这几个项目不可合并!");
            }
            if (pdsfczhbxm == 0) {
                TjSampling tjSampling = getById(ids.get(0));
                Map<String, Object> map = hebingCaiYangInFo(ids);
                TjSampling sampling = new TjSampling();
                String proId = map.get("proId").toString();
                String proName = map.get("proName").toString();
                BeanUtil.copyProperties(tjSampling, sampling, new String[]{"id"});
                sampling.setProId(proId);
                sampling.setProName(proName);
                sampling.setIsMerge(1);
                sampling.setJyxh(idUtils.generateLisID(prefix));
                if (save(sampling)) {
                    if (updateHeBingXm(ids, sampling.getId())) {
                        return AjaxResult.success("合并项目成功!", sampling.getId());
                    }
        try {
            if (null != ids && !ids.isEmpty()) {
                if(ids.size()==1) return AjaxResult.error("请选择至少两条项目进行合并!");
                int i = panduanshifoukeyihebing(ids);
                if (i > 1) {
                    return AjaxResult.error("标本类型不一致,不可合并");
                }
                return AjaxResult.error("操作失败!");
            } else {
                TjSampling tjSampling = getTjSamplingByHb(ids);
                List<TjSampling> samplingList = getTjSamplingListByHb(ids);
                if (null != tjSampling && null != samplingList && !samplingList.isEmpty()) {
                    List<String> stringList = samplingList.stream().map(TjSampling::getId).collect(Collectors.toList());
                    Map<String, Object> map = hebingCaiYangInFo(stringList);
                int pdsfczhbxm = pdsfczhbxm(ids);
                if (pdsfczhbxm == ids.size()) return AjaxResult.error("多个合并项目不可再继续合并!");
                if (pdsfczhbxm > 1) return AjaxResult.error("最多允许选择一个合并过的项目!");
    //            查询出里面不可合并的化验项目
                String string = getBuKeHebingProName(ids);
                if(null !=string){
                    return AjaxResult.error(string + "这几个项目不可合并!");
                }
                if (pdsfczhbxm == 0) {
                    TjSampling tjSampling = getById(ids.get(0));
                    Map<String, Object> map = hebingCaiYangInFo(ids);
                    TjSampling sampling = new TjSampling();
                    String proId = map.get("proId").toString();
                    String proName = map.get("proName").toString();
                    tjSampling.setProId(proId);
                    tjSampling.setProName(proName);
                    if (updateById(tjSampling)) {
                        if (updateHeBingXm(stringList, tjSampling.getParentId())) {
                            return AjaxResult.success("合并项目成功!", tjSampling.getId());
                    BeanUtil.copyProperties(tjSampling, sampling, new String[]{"id"});
                    sampling.setProId(proId);
                    sampling.setProName(proName);
                    sampling.setIsMerge(1);
                    sampling.setJyxh(idUtils.generateLisID(prefix));
                    if (save(sampling)) {
                        if (updateHeBingXm(ids, sampling.getId())) {
                            return AjaxResult.success("合并项目成功!", sampling.getId());
                        }
                    }
                    return AjaxResult.error("操作失败!");
                } else {
                    TjSampling tjSampling = getTjSamplingByHb(ids);
                    List<TjSampling> samplingList = getTjSamplingListByHb(ids);
                    if (null != tjSampling && null != samplingList && !samplingList.isEmpty()) {
                        List<String> stringList = samplingList.stream().map(TjSampling::getId).collect(Collectors.toList());
                        Map<String, Object> map = hebingCaiYangInFo(stringList);
                        String proId = map.get("proId").toString();
                        String proName = map.get("proName").toString();
                        tjSampling.setProId(proId);
                        tjSampling.setProName(proName);
                        if (updateById(tjSampling)) {
                            if (updateHeBingXm(stringList, tjSampling.getParentId())) {
                                return AjaxResult.success("合并项目成功!", tjSampling.getId());
                            }
                        }
                    }
                    return AjaxResult.error("操作失败!");
                }
                return AjaxResult.error("操作失败!");
            }
        } catch (Exception e) {
            log.error(e.getMessage());
        }
        return AjaxResult.error("请选择你要合并的项目!!!");
    }