zjh20250620

zjh

2025-06-20 5f1d1c462bbf49bc6a22b9e17b49733bcc1e0bc6

zjh20250620

 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java

@@ -2530,11 +2530,11 @@
        String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
        String isRequestLisAllzx = configService.selectConfigByKey("jcx_is_requestLisAllzx");
        if (mergeRequest.equals("Y")){
            if (isRequestLisAllzx != null && isRequestLisAllzx.equals("Y")){
                log.info("进入团体根据小项标本合并发送方法");
                LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
                wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
                List<TjSampling> list = tjSamplingService.list(wrapper);
            if (isRequestLisAllzx != null && isRequestLisAllzx.equals("Y")){
                log.info("进入团体根据小项标本合并发送方法");
                if(null !=list && !list.isEmpty()){
                    List<String> strings = list.stream().map(TjSampling::getProId).collect(Collectors.toList());
                    LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
@@ -2562,9 +2562,9 @@

            }else{
                try {
                    LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
                    wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
                    List<TjSampling> list = tjSamplingService.list(wrapper);
//                    LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
//                    wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
//                    List<TjSampling> list = tjSamplingService.list(wrapper);
                    log.info("采样数据 ->{}",JSONUtil.toJsonStr(list));
                    if (!list.isEmpty()) {
                        Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode));

 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java

@@ -871,6 +871,7 @@
    }*/

    public AjaxResult hisPDFNew2(TjOrder tjOrder, TjCustomer customer, TjReportTemplate tjReportTemplate, TjReportTemplate zongJianYiShiQianMing) throws Exception {
       try {
        String s1 = sysConfigService.selectConfigByKey("tjreport_font_size_second_page_info");
        String s2 = sysConfigService.selectConfigByKey("tjreport_font_size_second_page_title");
        String s3 = sysConfigService.selectConfigByKey("tjreport_font_size_result_title");
@@ -1005,7 +1006,7 @@


        int xmXh = 1;
        Map<Long, List<TjOrderDetail>> collect = orderDetails.stream().collect(Collectors.groupingBy(TjOrderDetail::getProId));
//           Map<Long, List<TjOrderDetail>> collect = orderDetails.stream().collect(Collectors.groupingBy(TjOrderDetail::getProId));
        LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
        wq.eq(TjOrderYcxm::getTjh, tjOrder.getTjNumber());
        List<TjOrderYcxm> ycxms = ycxmService.list(wq);
@@ -1496,6 +1497,10 @@
        String outputFileName1 = customer.getCusId() + tjOrder.getTjNumber() + customer.getCusName() + "_报告.pdf";
        savePDFFile(outputFileName1, tjOrder, customer, finalOutput);
        return AjaxResult.success();
        } catch (Exception e) {
            log.error(String.valueOf(e));
            throw new Exception(e);
        }
    }

    /**
@@ -1726,6 +1731,7 @@
     * @throws DocumentException
     */
    private void makeHisJianYanTable(Document document1, HashMap<String, Object> map, DictHosp dictHosp, String colorStr) throws DocumentException {
        try {
        if (!map.isEmpty()) {
            String[] titles = new String[]{"体检项目", "体检结果", "提示", "单位", "参考范围"};
            float[] titlesWidth = new float[]{280, 100, 40, 100, 120};
@@ -1788,6 +1794,9 @@
                }
            }
        }
        } catch (DocumentException e) {
            throw new RuntimeException(e);
        }
    }

    /**
@@ -1798,6 +1807,7 @@
     * @throws DocumentException
     */
    private void notHuaYanTable(Document document1, Map<TjOrderRemark, List<TjPdfVO>> printReport, DictHosp dictHosp, String colorStr, boolean isPacs) throws DocumentException {
        try {
        List<TjReportSpecialProject> tjReportSpecialProjects = tjReportSpecialProjectService.list();
        for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
            LambdaQueryWrapper<TjProject> wqqq = new LambdaQueryWrapper<>();
@@ -1873,8 +1883,11 @@
                                    paragraph.setLeading(5f);
                                    document1.add(ppp);
                                }
                                    if (StrUtil.isNotBlank(value.get(0).getTs())) {
                                pp = PdfUtils.setParagraph(remarkFonts, "检查提示："+value.get(0).getTs().replaceAll("\n",""));
                                document1.add(pp);
                                    }

//                                ppp = new Paragraph(value.get(0).getTs(), remarkFonts);
//                                paragraph.setAlignment(Element.ALIGN_LEFT);
//                                paragraph.setLeading(5f);
@@ -2098,6 +2111,11 @@
                }
            }
        }
        } catch (NumberFormatException e) {
            throw new RuntimeException(e);
        } catch (DocumentException e) {
            throw new RuntimeException(e);
        }
    }

    /**
@@ -2229,6 +2247,7 @@
    }

    public HashMap<String, Object> makeHisJianYan(TjOrder tjOrder, TjCustomer customer) {
        try {
        LambdaQueryWrapper<LtkjHysqd> ltkjHysqdLambdaQueryWrapper = new LambdaQueryWrapper<>();
        ltkjHysqdLambdaQueryWrapper.eq(LtkjHysqd::getTjh, tjOrder.getCardId());
        List<LtkjHysqd> list = ltkjHysqdService.list(ltkjHysqdLambdaQueryWrapper);
@@ -2327,6 +2346,9 @@
            }
        }
        return data;
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }

    /**
@@ -2503,6 +2525,7 @@
     * @param customer
     */
    private void notHuaYanData(String tjNumber, Map<TjOrderRemark, List<TjPdfVO>> printReport, TjOrder one, TjCustomer customer) {
        try {
//        LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
//        wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
//        wqq.ne(TjOrderRemark::getDeptId, "241");
@@ -2553,6 +2576,9 @@
            }
            printReport.put(entry.getKey(), tjPdfVOS);
        }
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }

    private void pacsJianChaData(String tjNumber, Map<TjOrderRemark, List<TjPdfVO>> printReport, TjOrder one, TjCustomer customer) {
@@ -2562,6 +2588,7 @@
//        wqq.in(TjOrderRemark::getDeptId, "269", "270", "253", "254", "255", "257");
//        wqq.notIn(TjOrderRemark::getProId, projectService.getNneedReprotProId());
//        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
        try {
        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.pacsJianChaData(tjNumber);
        for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
            printReport.put(tjOrderRemark, null);
@@ -2627,6 +2654,9 @@
            }
            printReport.put(entry.getKey(), tjPdfVOS);
        }
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }

    /**

 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java

@@ -42,6 +42,7 @@
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -2443,7 +2444,10 @@
            List<TbTransition> detailList = transitionService.getBlTbTransitionListByCusId(customer.getCusIdcard(), cardId, jxbz);
//            Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
            List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos = new ArrayList<>();
            String isRequestLisAllzx = configService.selectConfigByKey("jcx_is_requestLisAllzx");

            if (isTuanTiPiao) {

                // 检查申请
                pacsReg(order, customer, jianChaProjects);
                LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
@@ -2451,6 +2455,36 @@
                wrapper.eq(TjSampling::getJxbz, jxbz);
                List<TjSampling> list = tjSamplingService.list(wrapper);
                log.info("采样数据 ->{}", JSONUtil.toJsonStr(list));

                if (isRequestLisAllzx != null && isRequestLisAllzx.equalsIgnoreCase("Y")){
                    log.info("补录项目进入团体根据小项标本合并发送方法");

                    if(null !=list && !list.isEmpty()){
                        List<String> strings = list.stream().map(TjSampling::getProId).collect(Collectors.toList());
                        LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
                        wrapper1.in(TjProject::getProParentId,strings);
                        wrapper1.eq(TjProject::getProStatus,0);
                        wrapper1.groupBy(TjProject::getProId);
                        List<TjProject> tjProjectList = projectService.list(wrapper1);
                        if(null !=  tjProjectList && !tjProjectList.isEmpty()){
                            Map<String, List<TjProject>> listMap = tjProjectList.stream()
                                    .collect(Collectors.groupingBy(p->p.getSpecimenType()+"_"+p.getYb()));

                            log.info("分组后 ->{}",JSONUtil.toJsonStr(listMap));
                            boolean save = lisApiMethod.save(listMap, order, customer);
                            if (!save) {
                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                                return AjaxResult.error("处理失败");
                            }
                            for (TjSampling tjSampling : list) {
                                tjSampling.setIsSignFor("0");
                            }
                            tjSamplingService.updateBatchById(list);
                        }
                    }


                }else {
                if (!list.isEmpty()) {
//                    Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode));
                    Map<String, List<TjSampling>> listMap = list.stream()
@@ -2488,6 +2522,8 @@
                    if (!confirmed)
                        return AjaxResult.error("处理失败");
                }
                }

            } else {
                List<TjOutpinmedicXm> outpinmedicXms = tjOutpinmedicXmService.list();
                //检验申请

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

New file
@@ -0,0 +1,99 @@
package com.ltkj.web.controller.system;

import com.ltkj.common.annotation.Log;
import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.core.page.TableDataInfo;
import com.ltkj.common.enums.BusinessType;
import com.ltkj.common.utils.poi.ExcelUtil;
import com.ltkj.hosp.domain.LtkjHtxxb;
import com.ltkj.hosp.service.ILtkjHtxxbService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.List;

/**
 * 合同信息Controller
 *
 * @author ltkj
 * @date 2025-02-24
 */
@RestController
@RequestMapping("/system/htxxb")
@Api(tags = "LT合同信息Controller")
public class LtkjHtxxbController extends BaseController {
    @Autowired
    private ILtkjHtxxbService ltkjHtxxbService;

    /**
     * 查询合同信息列表
     */
//@PreAuthorize("@ss.hasPermi('system:htxxb:list')")
    @GetMapping("/list")
    @ApiOperation(value = "查询合同信息列表")
    public TableDataInfo list(LtkjHtxxb ltkjHtxxb) {
        startPage();
        List<LtkjHtxxb> list = ltkjHtxxbService.selectLtkjHtxxbList(ltkjHtxxb);
        return getDataTable(list);
    }

    /**
     * 导出合同信息列表
     */
//    @PreAuthorize("@ss.hasPermi('system:htxxb:export')")
    @Log(title = "合同信息", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    @ApiOperation(value = "导出合同信息列表")
    public void export(HttpServletResponse response, LtkjHtxxb ltkjHtxxb) {
        List<LtkjHtxxb> list = ltkjHtxxbService.selectLtkjHtxxbList(ltkjHtxxb);
        ExcelUtil<LtkjHtxxb> util = new ExcelUtil<LtkjHtxxb>(LtkjHtxxb.class);
        util.exportExcel(response, list, "合同信息数据");
    }

    /**
     * 获取合同信息详细信息
     */
//    @PreAuthorize("@ss.hasPermi('system:htxxb:query')")
    @GetMapping(value = "/{id}")
    @ApiOperation(value = "获取合同信息详细信息")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return success(ltkjHtxxbService.getById(id));
    }

    /**
     * 新增合同信息
     */
//    @PreAuthorize("@ss.hasPermi('system:htxxb:add')")
    @Log(title = "合同信息", businessType = BusinessType.INSERT)
    @PostMapping
    @ApiOperation(value = "新增合同信息")
    public AjaxResult add(@RequestBody LtkjHtxxb ltkjHtxxb) {
        return toAjax(ltkjHtxxbService.save(ltkjHtxxb));
    }

    /**
     * 修改合同信息
     */
//    @PreAuthorize("@ss.hasPermi('system:htxxb:edit')")
    @Log(title = "合同信息", businessType = BusinessType.UPDATE)
    @PutMapping
    @ApiOperation(value = "修改合同信息")
    public AjaxResult edit(@RequestBody LtkjHtxxb ltkjHtxxb) {
        return toAjax(ltkjHtxxbService.updateById(ltkjHtxxb));
    }

    /**
     * 删除合同信息
     */
//    @PreAuthorize("@ss.hasPermi('system:htxxb:remove')")
    @Log(title = "合同信息", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @ApiOperation(value = "删除合同信息")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(ltkjHtxxbService.deleteLtkjHtxxbByIds(ids));
    }
}

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

@@ -55,6 +55,15 @@
    public TableDataInfo list(SysNotice notice) {
        startPage();
        List<SysNotice> list = noticeService.selectNoticeList(notice);
        for (SysNotice sysNotice : list) {
            LambdaQueryWrapper<SysNoticeUser> wq = new LambdaQueryWrapper<>();
            wq.eq(SysNoticeUser::getNoticeId, sysNotice.getNoticeId());
            List<SysNoticeUser> sysNoticeUsers = sysNoticeUserService.list(wq);
            if(null != sysNoticeUsers && !sysNoticeUsers.isEmpty()){
                List<String> longList = sysNoticeUsers.stream().map(i -> i.getUserId().toString()).collect(Collectors.toList());
                sysNotice.setUserIds(longList);
            }
        }
        return getDataTable(list);
    }


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

@@ -557,13 +557,9 @@
                    order.setIdType(tjCustomer.getIdType());
                    order.setAgeUnit(tjCustomer.getAgeUnit());
                    order.setTjCount(String.valueOf(tjCustomer.getCusNumber()));
                    if (null != tjCustomer.getCompName()) {
                        order.setDictCompName(tjCustomer.getCompName());
                    } else {
                        String firmId = order.getFirmId();
                        if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
                            order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName());
                        }
                    String firmName = order.getFirmName();
                    if (StringUtil.isNotBlank(firmName)) {
                        order.setDictCompName(firmName);
                    }
                    if (null != order.getPacId()) {
                        if (null != tjPackageService.getById(order.getPacId())) {

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

@@ -439,8 +439,8 @@

            ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
        } catch (Exception e) {
//            e.printStackTrace();
//            log.error(String.valueOf(e));
            e.printStackTrace();
            log.error(String.valueOf(e));
            throw new Exception(e);
        }
        if (!ajaxResult.get("code").toString().equals("200")) {

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

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ltkj.common.annotation.Excel;
import com.ltkj.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

import java.math.BigDecimal;
import java.util.Date;

/**
 * 合同信息对象 ltkj_htxxb
 *
 * @author ltkj
 * @date 2025-02-24
 */
@Data
@ApiModel
public class LtkjHtxxb extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * $column.columnComment
     */
    @TableId(type = IdType.AUTO)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
     * 合同类型
     */
    @Excel(name = "合同类型")
    @ApiModelProperty(value = "合同类型")
    private String htlx;

    /**
     * 合同负责人
     */
    @Excel(name = "合同负责人")
    @ApiModelProperty(value = "合同负责人")
    private String htfzr;

    /**
     * 合同日期起始
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "合同日期起始", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "合同日期起始")
    private Date htrqqz;

    /**
     * 合同日期终止
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "合同日期终止", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "合同日期终止")
    private Date htrqzz;

    /**
     * 联系人姓名
     */
    @Excel(name = "联系人姓名")
    @ApiModelProperty(value = "联系人姓名")
    private String lxrxm;

    /**
     * 联系人电话
     */
    @Excel(name = "联系人电话")
    @ApiModelProperty(value = "联系人电话")
    private String lxrdh;

    /**
     * 合同金额
     */
    @Excel(name = "合同金额")
    @ApiModelProperty(value = "合同金额")
    private BigDecimal htje;

    /**
     * 续签标志
     */
    @Excel(name = "续签标志")
    @ApiModelProperty(value = "续签标志")
    private String xqbz;

    /**
     * 原合同序号
     */
    @Excel(name = "原合同序号")
    @ApiModelProperty(value = "原合同序号")
    private String yhtxh;

    /**
     * 备注
     */
    @Excel(name = "备注")
    @ApiModelProperty(value = "备注")
    private String bz;

    /**
     * 企业名称
     */
    @Excel(name = "企业名称")
    @ApiModelProperty(value = "企业名称")
    private String qymc;

    /**
     * 合同编号
     */
    @Excel(name = "合同编号")
    @ApiModelProperty(value = "合同编号")
    private String htbh;


    public void setId(Long id) {
        this.id = id;
    }

    public Long getId() {
        return id;
    }

    public void setHtlx(String htlx) {
        this.htlx = htlx;
    }

    public String getHtlx() {
        return htlx;
    }

    public void setHtfzr(String htfzr) {
        this.htfzr = htfzr;
    }

    public String getHtfzr() {
        return htfzr;
    }

    public void setHtrqqz(Date htrqqz) {
        this.htrqqz = htrqqz;
    }

    public Date getHtrqqz() {
        return htrqqz;
    }

    public void setHtrqzz(Date htrqzz) {
        this.htrqzz = htrqzz;
    }

    public Date getHtrqzz() {
        return htrqzz;
    }

    public void setLxrxm(String lxrxm) {
        this.lxrxm = lxrxm;
    }

    public String getLxrxm() {
        return lxrxm;
    }

    public void setLxrdh(String lxrdh) {
        this.lxrdh = lxrdh;
    }

    public String getLxrdh() {
        return lxrdh;
    }

    public void setHtje(BigDecimal htje) {
        this.htje = htje;
    }

    public BigDecimal getHtje() {
        return htje;
    }

    public void setXqbz(String xqbz) {
        this.xqbz = xqbz;
    }

    public String getXqbz() {
        return xqbz;
    }

    public void setYhtxh(String yhtxh) {
        this.yhtxh = yhtxh;
    }

    public String getYhtxh() {
        return yhtxh;
    }

    public void setBz(String bz) {
        this.bz = bz;
    }

    public String getBz() {
        return bz;
    }

    public void setQymc(String qymc) {
        this.qymc = qymc;
    }

    public String getQymc() {
        return qymc;
    }

    public void setHtbh(String htbh) {
        this.htbh = htbh;
    }

    public String getHtbh() {
        return htbh;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                .append("id", getId())
                .append("htlx", getHtlx())
                .append("htfzr", getHtfzr())
                .append("htrqqz", getHtrqqz())
                .append("htrqzz", getHtrqzz())
                .append("lxrxm", getLxrxm())
                .append("lxrdh", getLxrdh())
                .append("htje", getHtje())
                .append("xqbz", getXqbz())
                .append("yhtxh", getYhtxh())
                .append("bz", getBz())
                .append("qymc", getQymc())
                .append("htbh", getHtbh())
                .append("remark", getRemark())
                .append("createBy", getCreateBy())
                .append("createTime", getCreateTime())
                .append("updateBy", getUpdateBy())
                .append("updateTime", getUpdateTime())
                .append("deleted", getDeleted())
                .append("createId", getCreateId())
                .append("updateId", getUpdateId())
                .toString();
    }
}

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

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

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

import java.util.List;


/**
 * 合同信息Mapper接口
 *
 * @author ltkj
 * @date 2025-02-24
 */
@Mapper
public interface LtkjHtxxbMapper extends BaseMapper<LtkjHtxxb> {
    /**
     * 查询合同信息
     *
     * @param id 合同信息主键
     * @return 合同信息
     */
    public LtkjHtxxb selectLtkjHtxxbById(Long id);

    /**
     * 查询合同信息列表
     *
     * @param ltkjHtxxb 合同信息
     * @return 合同信息集合
     */
    public List<LtkjHtxxb> selectLtkjHtxxbList(LtkjHtxxb ltkjHtxxb);

    /**
     * 新增合同信息
     *
     * @param ltkjHtxxb 合同信息
     * @return 结果
     */
    public int insertLtkjHtxxb(LtkjHtxxb ltkjHtxxb);

    /**
     * 修改合同信息
     *
     * @param ltkjHtxxb 合同信息
     * @return 结果
     */
    public int updateLtkjHtxxb(LtkjHtxxb ltkjHtxxb);

    /**
     * 删除合同信息
     *
     * @param id 合同信息主键
     * @return 结果
     */
    public int deleteLtkjHtxxbById(Long id);

    /**
     * 批量删除合同信息
     *
     * @param ids 需要删除的数据主键集合
     * @return 结果
     */
    public int deleteLtkjHtxxbByIds(Long[] ids);
}

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

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

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

import java.util.List;


/**
 * 合同信息Service接口
 *
 * @author ltkj
 * @date 2025-02-24
 */
public interface ILtkjHtxxbService extends IService<LtkjHtxxb> {
    /**
     * 查询合同信息
     *
     * @param id 合同信息主键
     * @return 合同信息
     */
    public LtkjHtxxb selectLtkjHtxxbById(Long id);

    /**
     * 查询合同信息列表
     *
     * @param ltkjHtxxb 合同信息
     * @return 合同信息集合
     */
    public List<LtkjHtxxb> selectLtkjHtxxbList(LtkjHtxxb ltkjHtxxb);

    /**
     * 新增合同信息
     *
     * @param ltkjHtxxb 合同信息
     * @return 结果
     */
    public int insertLtkjHtxxb(LtkjHtxxb ltkjHtxxb);

    /**
     * 修改合同信息
     *
     * @param ltkjHtxxb 合同信息
     * @return 结果
     */
    public int updateLtkjHtxxb(LtkjHtxxb ltkjHtxxb);

    /**
     * 批量删除合同信息
     *
     * @param ids 需要删除的合同信息主键集合
     * @return 结果
     */
    public int deleteLtkjHtxxbByIds(Long[] ids);

    /**
     * 删除合同信息信息
     *
     * @param id 合同信息主键
     * @return 结果
     */
    public int deleteLtkjHtxxbById(Long id);
}

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

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.common.utils.DateUtils;
import com.ltkj.hosp.domain.LtkjHtxxb;
import com.ltkj.hosp.mapper.LtkjHtxxbMapper;
import com.ltkj.hosp.service.ILtkjHtxxbService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * 合同信息Service业务层处理
 *
 * @author ltkj
 * @date 2025-02-24
 */
@Service
public class LtkjHtxxbServiceImpl extends ServiceImpl<LtkjHtxxbMapper,LtkjHtxxb> implements ILtkjHtxxbService {
    @Autowired
    private LtkjHtxxbMapper ltkjHtxxbMapper;

    /**
     * 查询合同信息
     *
     * @param id 合同信息主键
     * @return 合同信息
     */
    @Override
    public LtkjHtxxb selectLtkjHtxxbById(Long id) {
        return ltkjHtxxbMapper.selectLtkjHtxxbById(id);
    }

    /**
     * 查询合同信息列表
     *
     * @param ltkjHtxxb 合同信息
     * @return 合同信息
     */
    @Override
    public List<LtkjHtxxb> selectLtkjHtxxbList(LtkjHtxxb ltkjHtxxb) {
        return ltkjHtxxbMapper.selectLtkjHtxxbList(ltkjHtxxb);
    }

    /**
     * 新增合同信息
     *
     * @param ltkjHtxxb 合同信息
     * @return 结果
     */
    @Override
    public int insertLtkjHtxxb(LtkjHtxxb ltkjHtxxb) {
                ltkjHtxxb.setCreateTime(DateUtils.getNowDate());
            return ltkjHtxxbMapper.insertLtkjHtxxb(ltkjHtxxb);
    }

    /**
     * 修改合同信息
     *
     * @param ltkjHtxxb 合同信息
     * @return 结果
     */
    @Override
    public int updateLtkjHtxxb(LtkjHtxxb ltkjHtxxb) {
                ltkjHtxxb.setUpdateTime(DateUtils.getNowDate());
        return ltkjHtxxbMapper.updateLtkjHtxxb(ltkjHtxxb);
    }

    /**
     * 批量删除合同信息
     *
     * @param ids 需要删除的合同信息主键
     * @return 结果
     */
    @Override
    public int deleteLtkjHtxxbByIds(Long[] ids) {
        return ltkjHtxxbMapper.deleteLtkjHtxxbByIds(ids);
    }

    /**
     * 删除合同信息信息
     *
     * @param id 合同信息主键
     * @return 结果
     */
    @Override
    public int deleteLtkjHtxxbById(Long id) {
        return ltkjHtxxbMapper.deleteLtkjHtxxbById(id);
    }
}

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

New file
@@ -0,0 +1,260 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ltkj.hosp.mapper.LtkjHtxxbMapper">

    <resultMap type="LtkjHtxxb" id="LtkjHtxxbResult">
            <result property="id" column="id"/>
            <result property="htlx" column="htlx"/>
            <result property="htfzr" column="htfzr"/>
            <result property="htrqqz" column="htrqqz"/>
            <result property="htrqzz" column="htrqzz"/>
            <result property="lxrxm" column="lxrxm"/>
            <result property="lxrdh" column="lxrdh"/>
            <result property="htje" column="htje"/>
            <result property="xqbz" column="xqbz"/>
            <result property="yhtxh" column="yhtxh"/>
            <result property="bz" column="bz"/>
            <result property="qymc" column="qymc"/>
            <result property="htbh" column="htbh"/>
            <result property="remark" column="remark"/>
            <result property="createBy" column="create_by"/>
            <result property="createTime" column="create_time"/>
            <result property="updateBy" column="update_by"/>
            <result property="updateTime" column="update_time"/>
            <result property="deleted" column="deleted"/>
            <result property="createId" column="create_id"/>
            <result property="updateId" column="update_id"/>
    </resultMap>

    <sql id="selectLtkjHtxxbVo">
        select id, htlx, htfzr, htrqqz, htrqzz, lxrxm, lxrdh, htje, xqbz, yhtxh, bz, qymc, htbh, remark, create_by, create_time, update_by, update_time, deleted, create_id, update_id
        from ltkj_htxxb
    </sql>

    <select id="selectLtkjHtxxbList" parameterType="LtkjHtxxb" resultMap="LtkjHtxxbResult">
        <include refid="selectLtkjHtxxbVo"/>
        <where>
                        <if test="htlx != null  and htlx != ''">
                            and htlx = #{htlx}
                        </if>
                        <if test="htfzr != null  and htfzr != ''">
                            and htfzr = #{htfzr}
                        </if>
                        <if test="htrqqz != null ">
                            and htrqqz = #{htrqqz}
                        </if>
                        <if test="htrqzz != null ">
                            and htrqzz = #{htrqzz}
                        </if>
                        <if test="lxrxm != null  and lxrxm != ''">
                            and lxrxm = #{lxrxm}
                        </if>
                        <if test="lxrdh != null  and lxrdh != ''">
                            and lxrdh = #{lxrdh}
                        </if>
                        <if test="htje != null ">
                            and htje = #{htje}
                        </if>
                        <if test="xqbz != null  and xqbz != ''">
                            and xqbz = #{xqbz}
                        </if>
                        <if test="yhtxh != null  and yhtxh != ''">
                            and yhtxh = #{yhtxh}
                        </if>
                        <if test="bz != null  and bz != ''">
                            and bz = #{bz}
                        </if>
                        <if test="qymc != null  and qymc != ''">
                            and qymc = #{qymc}
                        </if>
                        <if test="htbh != null  and htbh != ''">
                            and htbh = #{htbh}
                        </if>
                        <if test="deleted != null ">
                            and deleted = #{deleted}
                        </if>
                        <if test="createId != null  and createId != ''">
                            and create_id = #{createId}
                        </if>
                        <if test="updateId != null  and updateId != ''">
                            and update_id = #{updateId}
                        </if>
        </where>
    </select>

    <select id="selectLtkjHtxxbById" parameterType="Long"
            resultMap="LtkjHtxxbResult">
            <include refid="selectLtkjHtxxbVo"/>
            where id = #{id}
    </select>

    <insert id="insertLtkjHtxxb" parameterType="LtkjHtxxb" useGeneratedKeys="true"
            keyProperty="id">
        insert into ltkj_htxxb
        <trim prefix="(" suffix=")" suffixOverrides=",">
                    <if test="htlx != null">htlx,
                    </if>
                    <if test="htfzr != null">htfzr,
                    </if>
                    <if test="htrqqz != null">htrqqz,
                    </if>
                    <if test="htrqzz != null">htrqzz,
                    </if>
                    <if test="lxrxm != null">lxrxm,
                    </if>
                    <if test="lxrdh != null">lxrdh,
                    </if>
                    <if test="htje != null">htje,
                    </if>
                    <if test="xqbz != null">xqbz,
                    </if>
                    <if test="yhtxh != null">yhtxh,
                    </if>
                    <if test="bz != null">bz,
                    </if>
                    <if test="qymc != null">qymc,
                    </if>
                    <if test="htbh != null">htbh,
                    </if>
                    <if test="remark != null">remark,
                    </if>
                    <if test="createBy != null">create_by,
                    </if>
                    <if test="createTime != null">create_time,
                    </if>
                    <if test="updateBy != null">update_by,
                    </if>
                    <if test="updateTime != null">update_time,
                    </if>
                    <if test="deleted != null">deleted,
                    </if>
                    <if test="createId != null">create_id,
                    </if>
                    <if test="updateId != null">update_id,
                    </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                    <if test="htlx != null">#{htlx},
                    </if>
                    <if test="htfzr != null">#{htfzr},
                    </if>
                    <if test="htrqqz != null">#{htrqqz},
                    </if>
                    <if test="htrqzz != null">#{htrqzz},
                    </if>
                    <if test="lxrxm != null">#{lxrxm},
                    </if>
                    <if test="lxrdh != null">#{lxrdh},
                    </if>
                    <if test="htje != null">#{htje},
                    </if>
                    <if test="xqbz != null">#{xqbz},
                    </if>
                    <if test="yhtxh != null">#{yhtxh},
                    </if>
                    <if test="bz != null">#{bz},
                    </if>
                    <if test="qymc != null">#{qymc},
                    </if>
                    <if test="htbh != null">#{htbh},
                    </if>
                    <if test="remark != null">#{remark},
                    </if>
                    <if test="createBy != null">#{createBy},
                    </if>
                    <if test="createTime != null">#{createTime},
                    </if>
                    <if test="updateBy != null">#{updateBy},
                    </if>
                    <if test="updateTime != null">#{updateTime},
                    </if>
                    <if test="deleted != null">#{deleted},
                    </if>
                    <if test="createId != null">#{createId},
                    </if>
                    <if test="updateId != null">#{updateId},
                    </if>
        </trim>
    </insert>

    <update id="updateLtkjHtxxb" parameterType="LtkjHtxxb">
        update ltkj_htxxb
        <trim prefix="SET" suffixOverrides=",">
                    <if test="htlx != null">htlx =
                        #{htlx},
                    </if>
                    <if test="htfzr != null">htfzr =
                        #{htfzr},
                    </if>
                    <if test="htrqqz != null">htrqqz =
                        #{htrqqz},
                    </if>
                    <if test="htrqzz != null">htrqzz =
                        #{htrqzz},
                    </if>
                    <if test="lxrxm != null">lxrxm =
                        #{lxrxm},
                    </if>
                    <if test="lxrdh != null">lxrdh =
                        #{lxrdh},
                    </if>
                    <if test="htje != null">htje =
                        #{htje},
                    </if>
                    <if test="xqbz != null">xqbz =
                        #{xqbz},
                    </if>
                    <if test="yhtxh != null">yhtxh =
                        #{yhtxh},
                    </if>
                    <if test="bz != null">bz =
                        #{bz},
                    </if>
                    <if test="qymc != null">qymc =
                        #{qymc},
                    </if>
                    <if test="htbh != null">htbh =
                        #{htbh},
                    </if>
                    <if test="remark != null">remark =
                        #{remark},
                    </if>
                    <if test="createBy != null">create_by =
                        #{createBy},
                    </if>
                    <if test="createTime != null">create_time =
                        #{createTime},
                    </if>
                    <if test="updateBy != null">update_by =
                        #{updateBy},
                    </if>
                    <if test="updateTime != null">update_time =
                        #{updateTime},
                    </if>
                    <if test="deleted != null">deleted =
                        #{deleted},
                    </if>
                    <if test="createId != null">create_id =
                        #{createId},
                    </if>
                    <if test="updateId != null">update_id =
                        #{updateId},
                    </if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteLtkjHtxxbById" parameterType="Long">
        delete
        from ltkj_htxxb where id = #{id}
    </delete>

    <delete id="deleteLtkjHtxxbByIds" parameterType="String">
        delete from ltkj_htxxb where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>

 ltkj-system/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -27,7 +27,9 @@
               create_time,
               update_by,
               update_time,
               remark
               remark,
               dept_id

        from sys_notice
    </sql>