采样调整

zhaowenxuan

2024-12-05 5222547bc18ae20144547e2d60af5a6c26988cc2

采样调整

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

@@ -9,6 +9,8 @@
import com.ltkj.hosp.service.ITjCustomerService;
import com.ltkj.hosp.service.ITjOrderService;
import com.ltkj.hosp.service.ITjSamplingService;
import com.ltkj.system.mapper.SysConfigMapper;
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.web.controller.lis.LisApiMethod;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +29,10 @@
    private ITjCustomerService customerService;
    @Autowired
    private LisApiMethod lisApiMethod;
    @Autowired
    private SysConfigMapper sysConfigMapper;
    @Autowired
    private ISysConfigService sysConfigService;

    /**
     * 确认采样接口
@@ -38,6 +44,9 @@
    }

    public AjaxResult confirm(List<String> ids,String config,String mergeRequest) {


        // sfkqdshitulianjie
        if (null == ids || ids.isEmpty()) {
            return AjaxResult.error("请选择要确认项");
        }
@@ -46,9 +55,15 @@
            return AjaxResult.error("请选择要确认项");
        String errorMsg = "";
        for (TjSampling sampling : tjSamplings) {
            if (!sysConfigService.selectConfigByKey("sfkqdshitulianjie").toLowerCase().equals("y")) {
            if (sampling.getJyxmdm() == null)
                errorMsg+=sampling.getProName()+"在lis系统未找到对应编码无法发出申请";
            }
            sampling.setIsSignFor("0");




//                LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
//                wq.eq(TjProject::getProParentId, sampling.getProId());
//                List<TjProject> projectList = projectService.list(wq);

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

@@ -244,31 +244,31 @@
    /**
     * 根据客户获取采样列表
     *
     * @param cusId
     * @param tjNumber
     * @return
     */
    @GetMapping("/getCusCyList")
    @ApiOperation(value = "根据客户获取采样列表")
    public AjaxResult getCusCyList(@RequestParam @ApiParam(value = "客户id") String cusId,
    public AjaxResult getCusCyList(@RequestParam @ApiParam(value = "客户id") String tjNumber,
                                   @RequestParam(defaultValue = "1") @ApiParam(value = "0是1否") Integer isSignFor) {
        if (cusId == null || StrUtil.isBlank(cusId))
        if (tjNumber == null || StrUtil.isBlank(tjNumber))
            return AjaxResult.error("参数错误,未传参数");
        LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(TjSampling::getCusId, cusId);
        wrapper.eq(TjSampling::getTjNum, tjNumber);
        wrapper.eq(TjSampling::getIsSignFor,isSignFor);
        wrapper.and(i -> i.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1));
        wrapper.orderByDesc(TjSampling::getIsMerge);
        List<TjSampling> list = tjSamplingService.list(wrapper);
        if (list.isEmpty()){
            logger.info("cusId参数传的是:"+cusId);
            logger.info("jtNum ->{}",tjNumber);
            return AjaxResult.error("参数错误,未查询到数据");
        }
        for (TjSampling sampling : list) {
            TjCustomer customer = customerService.getById(sampling.getCusId());
            TjOrder order = orderService.getOrderByTjNum(sampling.getTjNum());
            if(null !=order)sampling.setCardId(order.getCardId());
            sampling.setCustomer(customer);
        }
//        for (TjSampling sampling : list) {
//            TjCustomer customer = customerService.getById(sampling.getCusId());
//            TjOrder order = orderService.getOrderByTjNum(sampling.getTjNum());
//            if(null !=order)sampling.setCardId(order.getCardId());
//            sampling.setCustomer(customer);
//        }

        if (list.size() >= 2) {
            // 进行合并
@@ -279,19 +279,25 @@
                    list.removeIf(item -> Objects.equals(item.getId(), s));
                }
            }
            Map<String, List<TjSampling>> map = list.stream().collect(Collectors.groupingBy(item -> item.getSpecimenTypeCode()));
            Map<String, List<TjSampling>> map = list.stream().filter(i->StrUtil.isNotBlank(i.getSpecimenTypeCode())).collect(Collectors.groupingBy(item -> item.getSpecimenTypeCode()));
            for (Map.Entry<String, List<TjSampling>> entry : map.entrySet()) {
                List<TjSampling> entryValue = entry.getValue();
                tjSamplingService.mergeCaiYangTran(entryValue.stream().map(TjSampling::getId).collect(Collectors.toList()));
            }
        }
        wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(TjSampling::getCusId, cusId);
        wrapper.eq(TjSampling::getTjNum, tjNumber);
        wrapper.eq(TjSampling::getIsSignFor,isSignFor);
        wrapper.and(i -> i.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1));
//        wrapper.orderByDesc(TjSampling::getIsMerge);
        wrapper.orderByAsc(TjSampling::getSpecimenTypeCode,TjSampling::getIsMerge);
        list = tjSamplingService.list(wrapper);
        for (TjSampling sampling : list) {
            TjCustomer customer = customerService.getById(sampling.getCusId());
            TjOrder order = orderService.getOrderByTjNum(sampling.getTjNum());
            if(null !=order)sampling.setCardId(order.getCardId());
            sampling.setCustomer(customer);
        }
        return AjaxResult.success(list);
    }