zjh
2025-01-16 5c58a8a9fa43c671af54358172f853f02c4acfc7
zjh20250116
5个文件已修改
4个文件已添加
189 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjJcycxm.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjJcycxmMapper.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjJcycxmService.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjJcycxmServiceImpl.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
@@ -1,6 +1,7 @@
package com.ltkj.web.config.timer;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.TjJcycxm;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
@@ -8,6 +9,7 @@
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import com.ltkj.hosp.sqlDomain.LtkjHysqd;
import com.ltkj.system.service.ISysConfigService;
import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Profile;
@@ -35,7 +37,7 @@
 */
@Slf4j
@Component
@Profile("!dev")
//@Profile("!dev")
public class DefaultScheduled {
@@ -55,6 +57,8 @@
    private TestMapper testMapper;
    @Resource
    private TjAsyncService asyncService;
    @Autowired
    private TjJcycxmService jcycxmService;
    private final ReentrantLock reentrantLock = new ReentrantLock();
@@ -84,6 +88,7 @@
    private void exec() {
        String dsqkssj = configService.selectConfigByKey("dsqkssj");
        String dsqjssj = configService.selectConfigByKey("dsqjssj");
        String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
        boolean panduandangqianshijian = panduandangqianshijian(dsqkssj, dsqjssj);
        log.info("当前时间是否在 " + dsqkssj + " 点到 " + dsqjssj + " 点之间: " + panduandangqianshijian);
            String dsrwsjjg = configService.selectConfigByKey("dsrwsjjg");
@@ -103,7 +108,6 @@
                        if (null != jy && !jy.isEmpty()) {
                            log.info("同步检验人员 执行数量->{}", jy.size());
                            for (String s : jy) {
//                        TjOrder order = orderService.getOrderByTjNum(s);
                                extractedjianyan(s);
                            }
                        }
@@ -112,7 +116,6 @@
                        if (null != jc && !jc.isEmpty()) {
                            log.info("同步检查人员 执行数量->{}", jc.size());
                            for (String s : jc) {
//                        TjOrder order = orderService.getOrderByTjNum(s);
                                extractedjiancha(s);
                            }
                        }
@@ -121,6 +124,35 @@
                        Integer object = (Integer) map.get("total");
                        log.info("执行存储过程后出参->{}", object);
                        if (null != object && object.equals(1)) {
                            if (null != jc && !jc.isEmpty()) {
                                for (String s : jc) {
                                    jcycxmService.deletedByTjh(s);
                                    List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(s);
                                    if(null !=list && !list.isEmpty()){
                                        for (LtkjExamJcsqd jcsqd : list) {
                                            if(jcsqd.getJgbx().contains("。")){
                                                String[] split = jcsqd.getJgbx().split("。");
                                                for (String jg : split) {
                                                    if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常")
                                                            && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见明显")){
                                                        TjJcycxm jcycxm=new TjJcycxm();
                                                        jcycxm.setTjh(s);
                                                        jcycxm.setYqid(yqbm);
                                                        String[] split1 = jcsqd.getJcxmid().split(";");
                                                        jcycxm.setProId(split1[0]);
                                                        jcycxm.setProName(jcsqd.getJcxmmc());
                                                        jcycxm.setCreateTime(new Date());
                                                        jcycxm.setJcjg(jg);
                                                        jcycxmService.save(jcycxm);
                                                    }
                                                }
                                            }
                                        }
                                    }
                                }
                            }
                            long end = System.currentTimeMillis();
                            log.info("同步结束 耗时:{}秒", (end - start) / 1000);
                            // 动态获取下次任务的间隔
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -12,12 +12,14 @@
import com.ltkj.common.core.domain.entity.SysMenu;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.hosp.domain.DictHosp;
import com.ltkj.hosp.domain.TjJcycxm;
import com.ltkj.hosp.domain.TjProject;
import com.ltkj.hosp.service.IDictHospService;
import com.ltkj.hosp.service.ITjProjectService;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
import com.ltkj.system.service.ISysMenuService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jodd.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -52,6 +54,12 @@
    private String secret;
    @Autowired
    private ITjProjectService projectService;
    @Resource
    private ITjOrderService orderService;
    @Autowired
    private TjJcycxmService jcycxmService;
    @Resource
    private LtkjExamJcsqdService jcsqdService;
    /**
     * 获取参数配置列表
@@ -210,4 +218,42 @@
        return AjaxResult.success();
    }
    @GetMapping ("/tjjcycxm")//同步his项目单价信息
//    @PreAuthorize("@ss.hasPermi('system:config:tbhisproprice')")
    @ApiOperation (value = "tjjcycxm")
    public AjaxResult tjjcycxm() {
        String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
        List<String> jc = orderService.getJianChaTjNum();
        if (null != jc && !jc.isEmpty()) {
            for (String s : jc) {
                jcycxmService.deletedByTjh(s);
                List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(s);
                if(null !=list && !list.isEmpty()){
                    for (LtkjExamJcsqd jcsqd : list) {
                        if(jcsqd.getJgbx().contains("。")){
                            String[] split = jcsqd.getJgbx().split("。");
                            for (String jg : split) {
                                if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常")
                                        && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见明显")){
                                    TjJcycxm jcycxm=new TjJcycxm();
                                    jcycxm.setTjh(s);
                                    jcycxm.setYqid(yqbm);
                                    String[] split1 = jcsqd.getJcxmid().split(";");
                                    jcycxm.setProId(split1[0]);
                                    jcycxm.setProName(jcsqd.getJcxmmc());
                                    jcycxm.setCreateTime(new Date());
                                    jcycxm.setJcjg(jg);
                                    jcycxmService.save(jcycxm);
                                }
                            }
                        }
                    }
                }
            }
        }
        return AjaxResult.success();
    }
}
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjJcycxm.java
New file
@@ -0,0 +1,22 @@
package com.ltkj.hosp.domain;
import com.ltkj.common.core.domain.BaseEntity;
import lombok.Data;
/**
 * ClassName: TjJcycxm <br/>
 * Description: <br/>
 * date: 2025/1/16 17:29<br/>
 *
 * @author zjh<br />
 */
@Data
public class TjJcycxm extends BaseEntity {
    private String id;
    private String tjh;
    private String proId;
    private String proName;
    private String yqid;
    private String jcjg;
}
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjJcycxmMapper.java
New file
@@ -0,0 +1,19 @@
package com.ltkj.hosp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjJcycxm;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
/**
 * ClassName: TjJcycxmMapper <br/>
 * Description: <br/>
 * date: 2025/1/16 18:21<br/>
 *
 * @author zjh<br />
 */
@Mapper
public interface TjJcycxmMapper extends BaseMapper<TjJcycxm> {
    @Delete("DELETE FROM tj_jcycxm  WHERE tjh=#{s}")
    void deletedByTjh(String s);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -331,4 +331,13 @@
    List<List<?>>  getTjBgdyList(Map<String, Object> map);
    @Select("  SELECT\n" +
            " DISTINCT a.tj_number \n" +
            "FROM\n" +
            "  tj_order_remark a\n" +
            "  JOIN sys_dept b ON b.dept_id = a.dept_id \n" +
            "WHERE\n" +
            "  a.deleted = 0 \n" +
            "  AND b.org_type = 2 \n")
    List<String> getJianChaTjNum();
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -181,6 +181,8 @@
    List<String> getDingShiTongBuJianChaTjNum();
    List<String> getJianChaTjNum();
    void tjQiandaodengji(String tjNum);
    void tjLispacstongbujianyi(String tjNumber, Long deptId,String nickName, Long userId);
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjJcycxmService.java
New file
@@ -0,0 +1,17 @@
package com.ltkj.hosp.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.domain.TjJcycxm;
/**
 * ClassName: TjJcycxmService <br/>
 * Description: <br/>
 * date: 2025/1/16 18:21<br/>
 *
 * @author zjh<br />
 */
public interface TjJcycxmService extends IService<TjJcycxm> {
    void deletedByTjh(String s);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjJcycxmServiceImpl.java
New file
@@ -0,0 +1,27 @@
package com.ltkj.hosp.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.hosp.domain.TjJcycxm;
import com.ltkj.hosp.mapper.TjJcycxmMapper;
import com.ltkj.hosp.service.TjJcycxmService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
 * ClassName: TjJcycxmServiceImpl <br/>
 * Description: <br/>
 * date: 2025/1/16 18:22<br/>
 *
 * @author zjh<br />
 */
@Service
public class TjJcycxmServiceImpl extends ServiceImpl<TjJcycxmMapper, TjJcycxm> implements TjJcycxmService {
    @Resource
    private TjJcycxmMapper mapper;
    @Override
    public void deletedByTjh(String s) {
        mapper.deletedByTjh(s);
    }
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -405,6 +405,11 @@
    }
    @Override
    public List<String> getJianChaTjNum() {
        return tjOrderMapper.getJianChaTjNum();
    }
    @Override
    public void tjQiandaodengji(String tjNum) {
        Map<String, Object> map = new HashMap<>();
        map.put("tjNum",tjNum);