Merge remote-tracking branch 'origin/master'

zhaowenxuan

2024-10-17 52b3796bfe8d797e038a3af5f447d4832f9745e8

Merge remote-tracking branch 'origin/master'

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

@@ -6,9 +6,11 @@
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.ServletSecurityElement;
import javax.servlet.http.HttpServletResponse;
import javax.swing.plaf.basic.BasicScrollPaneUI;

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.plugins.pagination.Page;
@@ -17,10 +19,12 @@
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
import com.ltkj.web.controller.lis.LisApiMethod;
import com.sun.xml.internal.bind.v2.TODO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.aspectj.weaver.AjAttribute;
import org.springframework.beans.BeanUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -41,7 +45,7 @@
 */
@RestController
@RequestMapping("/sampling/sampling")
@Api(tags = "体检采样管理")
@Api(tags = "PC端 体检采样管理")
public class TjSamplingController extends BaseController {
    @Resource
    private ITjSamplingService tjSamplingService;
@@ -194,6 +198,7 @@
     * @return
     */
    @GetMapping("/getCusList")
    @ApiOperation(value = "获取采样客户列表")
    public AjaxResult getCusList(@RequestParam(defaultValue = "1") @ApiParam(value = "0是1否") Integer isSignFor,
                                 @RequestParam(required = false) @ApiParam(value = "体检号") String tjNum,
                                 @RequestParam(required = false) @ApiParam(value = "客户姓名") String name,
@@ -236,6 +241,7 @@
     * @return
     */
    @GetMapping("/getCusCyList")
    @ApiOperation(value = "根据客户获取采样列表")
    public AjaxResult getCusCyList(@RequestParam @ApiParam(value = "客户id") String cusId){
        if (cusId == null || StrUtil.isBlank(cusId))
            return AjaxResult.error("参数错误");
@@ -251,9 +257,41 @@
        return AjaxResult.success(list);
    }

    @PostMapping("/mergeCaiYang")
    public AjaxResult mergeCaiYang(@RequestBody List<String> ids){
        return AjaxResult.success();
    @GetMapping("/mergeCaiYang")
    @ApiOperation(value = "采样登记合并项目接口")
    public AjaxResult mergeCaiYang(@RequestParam List<String> ids){
        if(null !=ids && !ids.isEmpty()){
            int i = tjSamplingService.panduanshifoukeyihebing(ids);
            if(i>1){
                return AjaxResult.error("标本类型不一致,不可合并");
            }

            TjSampling tjSampling = tjSamplingService.getById(ids.get(0));


            //todo  加一条判断是否存在合并项目的查询sql
            //todo  判断传入的项目是否存在合并项目  不存在走原逻辑  存在走else


            Map<String,Object> map= tjSamplingService.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);
            if (tjSamplingService.save(sampling)) {
                for (String id : ids) {
                    TjSampling service = tjSamplingService.getById(id);
                    service.setParentId(sampling.getId());
                    service.setIsMerge(1);
                    tjSamplingService.updateById(service);
                }
                return AjaxResult.success("合并项目成功!");
            }
        }
        return AjaxResult.error("请选择你要合并的项目!!!");
    }

    /**

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjSamplingMapper.java

@@ -2,10 +2,13 @@

import java.util.Base64;
import java.util.List;
import java.util.Map;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjSampling;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

/**
 * 体检采样管理Mapper接口
@@ -62,4 +65,21 @@
     * @return 结果
     */
    public int deleteTjSamplingByIds(String[] ids);


    @Select({"<script>","SELECT GROUP_CONCAT(a.pro_id SEPARATOR ',')proId,GROUP_CONCAT(a.pro_name SEPARATOR ' + ') proName FROM tj_sampling a WHERE a.deleted=0 AND a.id " +
            "IN ","<foreach collection='ids' item='id' open='(' separator=',' close=')'>",
            "#{id}",
            "</foreach>",
            "</script>"})
    Map<String, Object> hebingCaiYangInFo(@Param("ids") List<String> ids);


    @Select({"<script>","SELECT COUNT(*) FROM(" +
            "SELECT GROUP_CONCAT(a.pro_id SEPARATOR ',')proId,GROUP_CONCAT(a.pro_name SEPARATOR ' + ') proName FROM tj_sampling a WHERE a.deleted=0 AND a.id " +
            "IN ","<foreach collection='ids' item='id' open='(' separator=',' close=')'>",
            "#{id}",
            "</foreach>", "GROUP BY a.specimen_type_code) aa" +
            "</script>"})
    int panduanshifoukeyihebing(@Param("ids") List<String> ids);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java

@@ -1,9 +1,11 @@
package com.ltkj.hosp.service;

import java.util.List;
import java.util.Map;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.domain.TjSampling;
import org.apache.ibatis.annotations.Param;

/**
 * 体检采样管理Service接口
@@ -59,4 +61,9 @@
     * @return 结果
     */
    public int deleteTjSamplingById(String id);

    Map<String, Object> hebingCaiYangInFo(List<String> ids);


    int panduanshifoukeyihebing(@Param("ids") List<String> ids);
}

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

@@ -1,6 +1,8 @@
package com.ltkj.hosp.service.impl;

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.common.utils.DateUtils;
@@ -88,4 +90,14 @@
    public int deleteTjSamplingById(String id) {
        return tjSamplingMapper.deleteTjSamplingById(id);
    }

    @Override
    public Map<String, Object> hebingCaiYangInFo(List<String> ids) {
        return tjSamplingMapper.hebingCaiYangInFo(ids);
    }

    @Override
    public int panduanshifoukeyihebing(List<String> ids) {
        return tjSamplingMapper.panduanshifoukeyihebing(ids);
    }
}