zjh20250411

zjh

2025-04-11 46f0694ffeaee5168a77d8935784963a3f8ee7aa

zjh20250411

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

@@ -2,6 +2,7 @@

import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;

@@ -61,8 +62,15 @@
        startPage();
        LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>();
        if (tjRules.getProId() != null) {
            List<TjProject> projects = projectService.getTjProjectListBySoneId(tjRules.getProId());
            if(null !=projects && !projects.isEmpty()){
                wq.and(w-> w.eq(TjRules::getProId, tjRules.getProId())
                        .or().in(TjRules::getProId,projects.stream().map(TjProject::getProId).collect(Collectors.toList())));
            }else {
            wq.eq(TjRules::getProId, tjRules.getProId());
        }

        }
        if (tjRules.getProName() != null) {
            wq.like(TjRules::getProName, tjRules.getProName());
        }

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

@@ -1,24 +1,31 @@
package com.ltkj.web.controller.system;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;

import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
import com.ltkj.hosp.vodomain.CsProVo;
import com.ltkj.system.service.ISysConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
import com.ltkj.common.annotation.Log;
import com.ltkj.common.core.controller.BaseController;
@@ -36,6 +43,7 @@
@RestController
@RequestMapping("/picture/picture")
@Api(tags = "体检心电图管理")
@Slf4j
public class TjXdPictureController extends BaseController {
    @Resource
    private ITjXdPictureService tjXdPictureService;
@@ -51,6 +59,12 @@
    private ITjOrderRemarkService remarkService;
    @Resource
    private ITjProjectService projectService;
    @Resource
    private TjXdtgmdjgService xdtgmdjgService;
    @Resource
    private LtkjExamJcbgdService jcbgdService;
    @Resource
    private LtkjExamJcsqdService jcsqdService;

    /**
     * 查询体检心电图管理列表
@@ -189,4 +203,224 @@
    public AjaxResult remove(@PathVariable String[] ids) {
        return toAjax(tjXdPictureService.deleteTjXdPictureByIds(ids));
    }




    @GetMapping ("/getYxJcList")
    @ApiOperation (value = "影像检查列表(骨密度和心电图)")//0待1已
    @Transactional
    public AjaxResult getYxJcList(@ApiParam (value = "审核状态  0待审核  1已审核") @RequestParam  Integer checkStatus,
                                  @ApiParam (value = "页码数(默认1)") @RequestParam (defaultValue = "1") Integer page,
                                  @ApiParam (value = "显示条数(默认10)") @RequestParam (defaultValue = "10") Integer pageSize,
                                  @ApiParam (value = "体检单号") @RequestParam (required = false) String tjNumber,
                                  @ApiParam (value = "单位") @RequestParam (required = false) Long compId,
                                  @ApiParam (value = "姓名)") @RequestParam (required = false) String name,
                                  @ApiParam (value = "套餐名)") @RequestParam (required = false) String tcm,
                                  @ApiParam (value = "开始时间") @RequestParam (required = false) String beginTime,
                                  @ApiParam (value = "结束时间") @RequestParam (required = false) String endTime) {

//        DateTime beginTimes = null;
//        DateTime endTimes = null;
//        if (null != beginTime && null != endTime) {
//            beginTimes = DateUtil.beginOfDay(DateUtil.parse(beginTime));
//            endTimes = DateUtil.endOfDay(DateUtil.parse(endTime));
//        }
//        //初始化体检订单表
//        List<TjOrder> orderList = null;
//        List<TjCustomer> customerList = new ArrayList<>();
//        Map<String, Object> map = new HashMap<>();
//
//        if (checkStatus == 0)
//            asyncService.wCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes));
//        if (checkStatus == 1)
//            asyncService.yCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes));
//
//        //根据姓名查询
//        if (null != name && !"".equals(name)) {
//            List<TjCustomer> list = customerService.getTjCustomerList(name);
//            if (null != list && list.size() > 0) {
//                List<TjCustomer> lists = new ArrayList<>();
//                for (TjCustomer customer : list) {
//                    orderList = orderService.getCsTjOrderListByCusId(customer.getCusId());
//                    if (null != orderList && orderList.size() > 0) {
//                        for (TjOrder tjOrder : orderList) {
//                            customer.setTjNumber(tjOrder.getTjNumber());
//                            customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
//                            customer.setOrderId(tjOrder.getOrderId());
//                            customer.setTjTime(tjOrder.getCreateTime());
//                            customer.setFinishTime(tjOrder.getFinishTime());
//                            customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
//                            customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
//                            customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
//                            customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
//                            if (tjOrder.getFirmId().equals("0")) {
//                                customer.setTjCompName(null);
//                            } else {
//                                customer.setTjCompName(compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId()).getCnName());
//                            }
//                            lists.add(customer);
//                        }
//                    }
//                }
//                List<TjCustomer> customers = null;
//                if (lists.size() > 0) {
//                    customers = lists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
//                }
//                map.put("customers", customers);
//                map.put("total", lists.size());
//                return AjaxResult.success(map);
//            }
//            return AjaxResult.success("暂无数据");
//        }
//
//        //条件查询
//        if (null != tjNumber || null != compId || (null != beginTime && null != endTime)) {
//            orderList = orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
//            return getResult(page, pageSize, orderList, customerList, map);
//        }
//
//        List<TjCustomer> customers = null;
//        if (checkStatus == 0) {
//            customers = redisCache.getCacheMapValue("cScheck", "ws");
//        }
//        if (checkStatus == 1) {
//            customers = redisCache.getCacheMapValue("cScheck", "ys");
//        }
//        if (customers != null && customers.size() > 0) {
//            List<TjCustomer> customerLists = customers.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
//            map.put("customers", customerLists);
//            map.put("total", customers.size());
//            return AjaxResult.success(map);
//        } else {
//            orderList = orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
//            return getResult(page, pageSize, orderList, customerList, map);
//        }
        Long deptId = SecurityUtils.getDeptId();
        log.info("影像检查列表(骨密度和心电图)接口 当前登录人科室"+deptId);
        String value = String.valueOf(compId);
        if (tjNumber == null) tjNumber = "";
        if (compId == null) value = "";
        if (name == null) name = "";
        if (beginTime == null) beginTime = "";
        if (endTime == null) endTime = "";
        if (tcm == null) tcm = "";
        return AjaxResult.success(orderService.getYxJcList(checkStatus,tjNumber, page, pageSize, value, beginTime, endTime, name,tcm,deptId.toString()));
    }

    @GetMapping ("/getYxJcXx")
    @ApiOperation (value = "影像检查骨密度心电图页面点击体检人员展示体检项目接口")
    public AjaxResult getYxJcXx(@ApiParam (value = "体检号") @RequestParam String tjNumber) {
        Long deptId = SecurityUtils.getDeptId();
        log.info("影像检查骨密度心电图页面点击体检人员展示体检项目接口当前登录人科室"+deptId);
        List<CsProVo> list = remarkService.getYxJcXx(tjNumber,deptId.toString());
        return AjaxResult.success(list);
    }

    @GetMapping ("/addYxJcXx")
    @ApiOperation (value = "提交影像检查骨密度心电图结果接口")
    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
    public AjaxResult addYxJcXx(@ApiParam (value = "体检号") @RequestParam String tjNumber,
                                @ApiParam (value = "项目id") @RequestParam String proId,
                                @ApiParam (value = "检查所见") @RequestParam String jcsj,
                                @ApiParam (value = "检查结论") @RequestParam String jcjl) {
        try {
            SysUser user = SecurityUtils.getLoginUser().getUser();
            TjOrder order = orderService.getOrderByTjNum(tjNumber);
            if(null !=order){
                TjProject project = projectService.getById(proId);
                if(null !=project){
                    List<TjProject> projects = projectService.getTjProjectListBySoneId(proId);
                    LambdaQueryWrapper<TjOrderDetail>wq1=new LambdaQueryWrapper<>();
                    wq1.eq(TjOrderDetail::getProId,projects.get(0).getProParentId());
                    wq1.eq(TjOrderDetail::getOrderId,order.getOrderId());
                    TjOrderDetail detail = detailService.getOne(wq1);
                    if(null !=detail){
                        detail.setProResult(jcjl+"。"+jcsj);
                        detail.setTjStatus(1L);
                        detailService.updateById(detail);
                        LambdaQueryWrapper<TjOrderRemark>wq2=new LambdaQueryWrapper<>();
                        wq2.eq(TjOrderRemark::getProId,proId);
                        wq2.eq(TjOrderRemark::getTjNumber,tjNumber);
                        TjOrderRemark orderRemark = remarkService.getOne(wq2);
                        if(null !=orderRemark){
                            orderRemark.setType(1);
                            remarkService.updateById(orderRemark);
                            xdtgmdjgService.deletedByTJhAndProId(tjNumber, proId);
                            TjXdtgmdjg xdtgmdjg=new TjXdtgmdjg();
                            xdtgmdjg.setTjh(tjNumber);
                            xdtgmdjg.setCardId(order.getCardId());
                            xdtgmdjg.setProId(proId);
                            xdtgmdjg.setProName(project.getProName());
                            xdtgmdjg.setJcsj(jcsj);
                            xdtgmdjg.setJcjl(jcjl);
                            xdtgmdjg.setCreateBy(user.getNickName());
                            xdtgmdjg.setCreateId(user.getUserId().toString());
                            xdtgmdjgService.save(xdtgmdjg);
                            saveTjXdtgmdjgByJcbgd(xdtgmdjg);
                        }
                    }
                }
                return AjaxResult.success();
            }
            return AjaxResult.error("暂无体检记录");
        } catch (Exception e) {
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            log.error("提交影像检查骨密度心电图结果接口"+e.getMessage());
            throw new RuntimeException("提交影像检查骨密度心电图结果接口");
        }
    }
    @Transactional(propagation = Propagation.REQUIRED) // 共享事务
    public void saveTjXdtgmdjgByJcbgd(TjXdtgmdjg xdtgmdjg) {
        try {
            int length = xdtgmdjg.getProId().length();
            // 确保字符串长度至少为6
            String last6 = length >= 6 ? xdtgmdjg.getProId().substring(length - 6) : xdtgmdjg.getProId();
            Date date = new Date();
            LtkjExamJcbgd jcbgd=new LtkjExamJcbgd();
            jcsqdService.deletedLtkjJcsqdByTjhandtmh(xdtgmdjg.getCardId(),xdtgmdjg.getTjh()+last6);
            jcbgdService.deletedLtkjJcbgdByTjhandtmh(xdtgmdjg.getCardId(),xdtgmdjg.getTjh()+last6);
            jcbgd.setTjh(xdtgmdjg.getCardId());
            jcbgd.setTmh(xdtgmdjg.getTjh()+last6);
            jcbgd.setXmdm(xdtgmdjg.getProId());
            jcbgd.setXmmc(xdtgmdjg.getProName());
            jcbgd.setBgNr(xdtgmdjg.getJcsj());
            jcbgd.setBgUrl("");
            jcbgd.setShysxm(xdtgmdjg.getCreateBy());
            jcbgd.setShysdm(xdtgmdjg.getCreateId());
            jcbgd.setYxzd(xdtgmdjg.getJcjl());
            jcbgd.setYxbx("未见异常");
            jcbgd.setZdsj(DateUtil.format(date,"yyyy-MM-dd"));
            jcbgd.setJcbw("");
            jcbgd.setSqsj(DateUtil.format(date,"yyyy-MM-dd"));
            jcbgd.setCreateTime(date);
            jcbgdService.save(jcbgd);
            jcsqdService.saveLtkjExamJcsqd(xdtgmdjg.getCardId());
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }


    @GetMapping ("/getYxJcXxJg")
    @ApiOperation (value = "获取影像检查骨密度心电图结果接口")
    @Transactional
    public AjaxResult getYxJcXxJg(@ApiParam (value = "体检号") @RequestParam String tjNumber,
                                  @ApiParam (value = "项目id") @RequestParam String proId) {
        TjOrder order = orderService.getOrderByTjNum(tjNumber);
        if(null !=order){
            LambdaQueryWrapper<TjXdtgmdjg> wq=new LambdaQueryWrapper<>();
            wq.eq(TjXdtgmdjg::getTjh,tjNumber);
            wq.eq(TjXdtgmdjg::getProId,proId);
            TjXdtgmdjg xdtgmdjg = xdtgmdjgService.getOne(wq);
            Map<String,Object>map=new HashMap<>();
            if(null !=xdtgmdjg ){
                map.put("jcsj",xdtgmdjg.getJcsj());
                map.put("jcjl",xdtgmdjg.getJcjl());
                return AjaxResult.success(map);
            }
            return AjaxResult.success(map);
        }
        return AjaxResult.error("暂无体检记录");
    }
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProAdvicerules.java

@@ -132,6 +132,8 @@
    @ExcelImport(value = "是否重大疾病", kv = "Y-✓")
    private String sfzdjb;

    private String xb;


    @Override
    public String toString() {

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjXdtgmdjg.java

New file
@@ -0,0 +1,28 @@
package com.ltkj.hosp.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ltkj.common.core.domain.BaseEntity;
import lombok.Data;

/**
 * ClassName: tjXdtgmdjg <br/>
 * Description: <br/>
 * date: 2025/3/31 15:20<br/>
 *
 * @author zjh<br />
 */
@Data
public class TjXdtgmdjg extends BaseEntity {
    @TableId(type = IdType.AUTO)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long Id;
    private String tjh;
    private String cardId;
    private String proId;
    private String proName;
    private String jcsj;
    private String jcjl;
}

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

@@ -7,6 +7,7 @@
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;
@@ -31,4 +32,9 @@

@Select("SELECT * FROM ltkj_exam_jcbgd WHERE tjh=#{cardId}")
    List<LtkjExamJcbgd> getJianJcBaoGaoDanByTjh(String cardId);


    @Delete("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tjh} and tmh=#{tmh} ")
    void deletedLtkjJcbgdByTjhandtmh(@Param("tjh") String tjh, @Param("tmh") String tmh);

}

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

@@ -51,4 +51,10 @@
                                                  @Param("pagecount")int pagecount,
                                                  @Param("page")int page,
                                                  @Param("status")String status);



    @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and tmh=#{tmh}")
    void  deletedLtkjJcsqdByTjhandtmh(@Param("tjh") String tjh,@Param("tmh") String tmh);

}

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

@@ -390,4 +390,7 @@

    @Select("SELECT count(*) FROM tj_order WHERE tj_number = #{tjNum}")
    int getOrderCountByTjNum(String tjNum);

    List<List<?>> getYxJcList(Map<String,Object> map);

}

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

@@ -286,4 +286,7 @@
    List<TjOrderRemark> shoufeiyemianyishoufei(@Param("tjNumber") String tjNumber, @Param("jxbz") String jxbz);

    List<TjOrderRemark> shoufeiyemianweishoufei(@Param("tjNumber") String tjNumber, @Param("jxbz") String jxbz);

    @Select("call tj_yxjcymxx(#{tjh,mode=IN},#{ks,mode=IN})")
    List<CsProVo> getYxJcXx(@Param("tjh")String tjNumber,@Param("ks")String ks);
}

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

New file
@@ -0,0 +1,14 @@
package com.ltkj.hosp.mapper;

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

@Mapper
public interface TjXdtgmdjgMapper extends BaseMapper<TjXdtgmdjg> {

    @Delete("DELETE FROM tj_xdtgmdjg  WHERE tjh=#{tjNumber} and pro_id=#{proId}")
    void deletedByTJhAndProId(@Param("tjNumber") String tjNumber, @Param("proId") String proId);
}

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

@@ -95,4 +95,6 @@
    List<TjOrderRemark> shoufeiyemianyishoufei(String tjNumber,String jxbz);

    List<TjOrderRemark> shoufeiyemianweishoufei(String tjNumber,String jxbz);

    List<CsProVo> getYxJcXx(String tjNumber, String string);
}

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

@@ -190,4 +190,8 @@
    Map<String, Object> getTjBgdyList(Integer pageNum, Integer pageSize, Integer dyzt, String tjNum, String name, String dw, String djbeginTime, String djendTime);

    int getOrderCountByTjNum(String tjh);

    //存储过程专用接口(初审)
    Map<String,Object> getYxJcList(Integer checkStatus ,String tjNumber,Integer page,Integer pageSize,
                                   String compId, String beginTime, String endTime,String tjname,String tcm,String deptId);
}

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

@@ -22,4 +22,6 @@
    List<LtkjExamJcbgd> getJianJcBaoGaoDanList(String tmh);

    List<LtkjExamJcbgd> getJianJcBaoGaoDanByTjh(String cardId);

    void deletedLtkjJcbgdByTjhandtmh(String cardId, String s);
}

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

@@ -28,4 +28,6 @@
    AjaxResult getTjJcProByHisCall(String ksmc,String strIn,String brid,int pagecount,int page,String status);

    List<LtkjExamJcbgd> queryLtkjExamJcsqdByTjh(String tjh);

    void deletedLtkjJcsqdByTjhandtmh(String cardId, String s);
}

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

New file
@@ -0,0 +1,8 @@
package com.ltkj.hosp.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.domain.TjXdtgmdjg;

public interface TjXdtgmdjgService extends IService<TjXdtgmdjg> {
    void deletedByTJhAndProId(String tjNumber, String proId);
}

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

@@ -44,4 +44,9 @@
    public List<LtkjExamJcbgd> getJianJcBaoGaoDanByTjh(String cardId) {
        return mapper.getJianJcBaoGaoDanByTjh(cardId);
    }

    @Override
    public void deletedLtkjJcbgdByTjhandtmh(String tjh, String tmh) {
        mapper.deletedLtkjJcbgdByTjhandtmh(tjh, tmh);
    }
}

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

@@ -60,6 +60,11 @@
    }

    @Override
    public void deletedLtkjJcsqdByTjhandtmh(String tjh, String tmh) {
        mapper.deletedLtkjJcsqdByTjhandtmh(tjh,tmh);
    }

    @Override
    public void saveLtkjExamJcsqd(String tjh) {
        mapper.saveLtkjExamJcsqd(tjh);
    }

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

@@ -193,4 +193,10 @@
        return mapper.shoufeiyemianweishoufei(tjNumber,jxbz);
    }

    @Override
    public List<CsProVo> getYxJcXx(String tjNumber,String ks) {
        List<CsProVo> yxJcXx = mapper.getYxJcXx(tjNumber,ks);
        return yxJcXx;
    }

}

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

@@ -453,4 +453,25 @@
    public int getOrderCountByTjNum(String tjNum) {
        return tjOrderMapper.getOrderCountByTjNum(tjNum);
    }

    @Override
    public Map<String, Object> getYxJcList(Integer checkStatus ,String tjNumber, Integer page, Integer pageSize,
                                           String compId, String beginTime, String endTime, String tjname,String tcm,String deptId) {
        Map<String, Object> map = new HashMap<>();
        map.put("checkStatus",checkStatus);
        map.put("page",page);
        map.put("pageSize",pageSize);
        map.put("tjNumber",tjNumber);
        map.put("compId",compId);
        map.put("tjname",tjname);
        map.put("tcm",tcm);
        map.put("beginTime",beginTime);
        map.put("endTime",endTime);
        map.put("ks",deptId);
        List<List<?>> list = tjOrderMapper.getYxJcList(map);
        Map<String,Object> map1=new HashMap<>();
        map1.put("customers",list);
        map1.put("total",map.get("total"));
        return map1;
    }
}

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

New file
@@ -0,0 +1,20 @@
package com.ltkj.hosp.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.hosp.domain.TjXdtgmdjg;
import com.ltkj.hosp.mapper.TjXdtgmdjgMapper;
import com.ltkj.hosp.service.TjXdtgmdjgService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@Service
public class TjXdtgmdjgServiceImpl extends ServiceImpl<TjXdtgmdjgMapper, TjXdtgmdjg> implements TjXdtgmdjgService {

    @Autowired
    private TjXdtgmdjgMapper mapper;

    @Override
    public void deletedByTJhAndProId(String tjNumber, String proId) {
        mapper.deletedByTJhAndProId(tjNumber,proId);
    }
}

 ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml

@@ -411,4 +411,20 @@
              )}
    </select>

    <select id="getYxJcList" parameterType="java.util.Map"  statementType="CALLABLE" resultType="java.util.Map">
        {call tj_xdtgmd_list(
                #{checkStatus,mode=IN,jdbcType=INTEGER},
                #{page,mode=IN,jdbcType=INTEGER},
                #{pageSize,mode=IN,jdbcType=INTEGER},
                #{tjNumber,mode=IN,jdbcType=VARCHAR},
                #{compId,mode=IN,jdbcType=VARCHAR},
                #{tjname,mode=IN,jdbcType=VARCHAR},
                #{beginTime,mode=IN,jdbcType=VARCHAR},
                #{endTime,mode=IN,jdbcType=VARCHAR},
                #{tcm,mode=IN,jdbcType=VARCHAR},
                #{ks,mode=IN,jdbcType=VARCHAR},
                #{total,mode=OUT,jdbcType=INTEGER}
              )}
    </select>

</mapper>

 ltkj-hosp/src/main/resources/mapper/hosp/TjProAdvicerulesMapper.xml

@@ -25,10 +25,31 @@
            <result property="createBy" column="create_by"/>
            <result property="updateBy" column="update_by"/>
            <result property="deleted" column="deleted"/>
        <result property="xb" column="xb"/>
    </resultMap>

    <sql id="selectTjProAdvicerulesVo">
        select id, bm, ks, jcxm, zyzd, jymc, jynr, fwz, fwzxz, fwzdz, ycbz, sfjb, sfcjb, sfmxb, sfzdjb, create_time, update_time, create_by, update_by, deleted
        select id,
               bm,
               ks,
               jcxm,
               zyzd,
               jymc,
               jynr,
               fwz,
               fwzxz,
               fwzdz,
               ycbz,
               sfjb,
               sfcjb,
               sfmxb,
               sfzdjb,
               create_time,
               update_time,
               create_by,
               update_by,
               deleted,
               xb
        from tj_pro_advicerules
    </sql>

@@ -64,6 +85,9 @@
                        </if>
                        <if test="sfzdjb != null  and sfzdjb != ''">
                            and sfzdjb = #{sfzdjb}
            </if>
            <if test="xb != null  and xb != ''">
                and xb = #{xb}
                        </if>
        </where>
        ORDER BY ks
@@ -118,6 +142,9 @@
                    </if>
                    <if test="deleted != null">deleted,
                    </if>

            <if test="xb != null">xb,
            </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                    <if test="id != null">#{id},
@@ -159,6 +186,8 @@
                    <if test="updateBy != null">#{updateBy},
                    </if>
                    <if test="deleted != null">#{deleted},
            </if>
            <if test="xb != null">#{xb},
                    </if>
        </trim>
    </insert>
@@ -223,13 +252,17 @@
                    <if test="deleted != null">deleted =
                        #{deleted},
                    </if>
            <if test="xb != null">xb =
                #{xb},
            </if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteTjProAdvicerulesById" parameterType="Long">
        delete
        from tj_pro_advicerules where id = #{id}
        from tj_pro_advicerules
        where id = #{id}
    </delete>

    <delete id="deleteTjProAdvicerulesByIds" parameterType="String">