zjh20250730-1

zjh

3 天以前 027c1328165a0d37a778ec7f58760bb0fe1ffebb

zjh20250730-1

 ltkj-admin/src/main/java/com/ltkj/web/config/captcha/LogTestRunner.java

New file
@@ -0,0 +1,16 @@
package com.ltkj.web.config.captcha;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.CommandLineRunner;
import org.springframework.stereotype.Component;

@Component
public class LogTestRunner implements CommandLineRunner {
    private static final Logger logger = LoggerFactory.getLogger(LogTestRunner.class);

    @Override
    public void run(String... args) {
        logger.info("=== 手动触发日志归档测试 ===");
    }
}

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

@@ -496,9 +496,9 @@
        }
        deleteSqlBuilder.delete(deleteSqlBuilder.length() - 5, deleteSqlBuilder.length());
        Statement statement = connection.prepareStatement(deleteSqlBuilder.toString());
        log.info("HIS数据保存类 执行删除 ->{}",deleteSqlBuilder.toString());
//        log.info("HIS数据保存类 执行删除 ->{}",deleteSqlBuilder.toString());
        int i = statement.executeUpdate(deleteSqlBuilder.toString());
        log.info("HIS数据保存类 删除条数 ->{}",i);
//        log.info("HIS数据保存类 删除条数 ->{}",i);
        statement.close();
        insertSqlBuilder.append("insert_time, ");
        insertSqlBuilder.append("request_params, ");
@@ -536,11 +536,11 @@
//                break;
//        }
        statement = connection.createStatement();
        log.info("HIS数据保存类 执行插入 ->{}",insertSqlBuilder.toString());
//        log.info("HIS数据保存类 执行插入 ->{}",insertSqlBuilder.toString());
        boolean execute = statement.execute(insertSqlBuilder.toString());
        if (!execute){
            int updateCount = statement.getUpdateCount();
            log.info("HIS数据保存类 执行插入成功 影响行数->{}",updateCount);
//            log.info("HIS数据保存类 执行插入成功 影响行数->{}",updateCount);
        }
        statement.close();
    }

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

@@ -97,7 +97,7 @@
        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
        String config = configService.selectConfigByKey("tj_dxsxtj");
        if (null != config && config.equals("N")) {
            tjProjects = tjProjectService.getOpenDxTjProjectList(null);
            tjProjects = tjProjectService.getOpenDxTjProjectList(null, null);
        }
        if (tjProjects != null) {
            for (TjProject project : tjProjects) {
@@ -596,7 +596,7 @@
        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
        String config = configService.selectConfigByKey("tj_dxsxtj");
        if (null != config && config.equals("N")) {
            tjProjects = tjProjectService.getOpenDxTjProjectList(null);
            tjProjects = tjProjectService.getOpenDxTjProjectList(null, null);
        }
        String key = configService.selectConfigByKey("is_open_sfxm");
        Map<String, Object> map = new HashMap<>();
@@ -609,11 +609,16 @@

    @GetMapping("/getProParentIdDxListByFenYe")
    @ApiOperation(value = "选择体检项目(所有页面项目)选单项时调用的接口(有分页)")
    public AjaxResult getProParentIdDxListByFenYe(@RequestParam(defaultValue = "1") int page,@RequestParam(defaultValue = "10") int pageSize,String nr) {
    public AjaxResult getProParentIdDxListByFenYe(@RequestParam(defaultValue = "1") int page,@RequestParam(defaultValue = "10") int pageSize,String nr,String xb) {
        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
        String config = configService.selectConfigByKey("tj_dxsxtj");
        if(StringUtil.isNotBlank(xb)){
            if(xb.contains("4"))xb="0";
            if(xb.contains("5"))xb="1";
            if(xb.contains("4") && xb.contains("5"))xb=null;
        }
        if (null != config && config.equals("N")) {
            tjProjects = tjProjectService.getOpenDxTjProjectList(nr);
            tjProjects = tjProjectService.getOpenDxTjProjectList(nr,xb);
        }
        String key = configService.selectConfigByKey("is_open_sfxm");
        Map<String, Object> map = new HashMap<>();

 ltkj-admin/src/main/resources/logback.xml

@@ -26,7 +26,7 @@


    <!-- 日志输出格式 -->
    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %n %msg%n"/>

    <!-- 控制台输出 -->
    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
@@ -40,7 +40,7 @@
        <!-- 彩色日志 -->
        <layout class="ch.qos.logback.classic.PatternLayout">
            <pattern>
                %d{yyyy-MM-dd HH:mm:ss} [%thread] %yellow(%-5level) %white([%-50.50class]) >>> %green(%msg) %n
                %d{yyyy-MM-dd HH:mm:ss} [%thread] %yellow(%-5level) %white([%-50.50class]) >>> %green(%n %msg) %n
            </pattern>
        </layout>
    </appender>

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

@@ -277,6 +277,8 @@
    @ApiModelProperty(value = "是否参与异常")
    private Integer sfcyyc;

    @ApiModelProperty(value = "样本")
    private String yb;
    /**
     * 子项目
     */

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

@@ -144,7 +144,7 @@
    List<TjProject> getDxTjProjectList();

//    @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 and deleted=0")
    List<TjProject> getOpenDxTjProjectList(String nr);
    List<TjProject> getOpenDxTjProjectList(@Param(value = "nr")String nr,@Param(value = "xb")String xb);


    @Select("SELECT a.*,GROUP_CONCAT(b.pro_name ORDER BY b.pro_name) AS all_son_pro_name FROM\n" +

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

@@ -111,7 +111,7 @@
    List<TjProject> getTjProjectList();
    List<TjProject> getDxTjProjectList();

    List<TjProject> getOpenDxTjProjectList(String nr);
    List<TjProject> getOpenDxTjProjectList(String nr,String xb);

    List<TjProject> getPacTjProjectList();


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

@@ -215,8 +215,8 @@
    }

    @Override
    public List<TjProject> getOpenDxTjProjectList(String nr) {
        return  tjProjectMapper.getOpenDxTjProjectList(nr);
    public List<TjProject> getOpenDxTjProjectList(String nr,String xb) {
        return  tjProjectMapper.getOpenDxTjProjectList(nr,xb);
    }

    @Override

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

@@ -237,6 +237,8 @@
            pro_parent_id=0 and pro_status=0 and deleted=0
            <if test="nr != null ">and (pro_name  like concat('%', #{nr}, '%')
                 or pro_eng_name  like concat('%', #{nr}, '%'))</if>
            <if test="null !=xb and xb !='' ">
                and (pro_sex=#{xb} or isnull(pro_sex) or pro_sex=2 ) </if>
        </where>