zjh202500815

zjh

2 天以前 bd94f17a788da5fde253ce877a2d79de5d04df9c

zjh202500815

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

@@ -82,6 +82,8 @@
    private AwsService awsService;
    @Autowired
    private ApiJcycpdgjzService apiJcycpdgjzService;
    @Autowired
    private TjOrderYcxmService ycxmService;

    /**
     * 获取参数配置列表
@@ -454,6 +456,7 @@
    public AjaxResult tjjcycxm(@ApiParam("体检号") @RequestParam(required = false)String tjh) {
        String yqbm = configService.selectConfigByKey("dqyyyqbm");
        if(StringUtil.isNotBlank(tjh)){
            ycxmService.delOrderYcXmJyByTjh(tjh);
            extracted(tjh, yqbm);
        }else {
            List<String> jc = orderService.getJianChaTjNum();
@@ -492,20 +495,6 @@
                                jcycxmService.save(jcycxm);
                            }
                        }

               /*         if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常")
                                && !jg.contains("未见明显异常") && !jg.matches("\\d+")  && !jg.contains("未见占位") && !jg.contains("未见")
                                && !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);
                        }*/
                    }
                }
            }

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

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
    <!-- 日志存放路径  windows环境-->

    <!-- 不同环境的基础日志路径 -->
    <springProfile name="dev">
        <property name="log.path" value="logs"/>
    </springProfile>
@@ -13,7 +14,6 @@
        <property name="log.path" value="logs/test"/>
    </springProfile>

    <!-- 日志存放路径  澄合医院linux环境-->
    <springProfile name="linux-prod">
        <property name="log.path" value="/ltkj/jar/logs"/>
    </springProfile>
@@ -22,13 +22,10 @@
        <property name="log.path" value="/ltkj/jar/logs/ceshi"/>
    </springProfile>




    <!-- 日志输出格式 -->
    <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">
        <encoder>
            <pattern>${log.pattern}</pattern>
@@ -45,91 +42,90 @@
        </layout>
    </appender>

    <!-- 系统日志输出 -->
    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${log.path}/sys-info.log</file>
        <!-- 循环政策：基于时间创建日志文件 -->
    <!-- 系统 INFO 日志，动态院区 -->
    <appender name="SIFT_INFO" class="ch.qos.logback.classic.sift.SiftingAppender">
        <discriminator class="ch.qos.logback.classic.sift.MDCBasedDiscriminator">
            <key>hospitalCode</key>
            <defaultValue>ltkjpeis</defaultValue>
        </discriminator>
        <sift>
            <appender name="FILE-${hospitalCode}" class="ch.qos.logback.core.rolling.RollingFileAppender">
                <file>${log.path}/${hospitalCode}/sys-info.log</file>
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!-- 日志文件名格式 -->
            <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
            <!-- 日志最大的历史 60天 -->
                    <fileNamePattern>${log.path}/${hospitalCode}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
            <maxHistory>60</maxHistory>
        </rollingPolicy>
        <encoder>
            <pattern>${log.pattern}</pattern>
        </encoder>
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <!-- 过滤的级别 -->
            <level>INFO</level>
            <!-- 匹配时的操作：接收（记录） -->
            <onMatch>ACCEPT</onMatch>
            <!-- 不匹配时的操作：拒绝（不记录） -->
            <onMismatch>DENY</onMismatch>
        </filter>
    </appender>
        </sift>
    </appender>

    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${log.path}/sys-error.log</file>
        <!-- 循环政策：基于时间创建日志文件 -->
    <!-- 系统 ERROR 日志，动态院区 -->
    <appender name="SIFT_ERROR" class="ch.qos.logback.classic.sift.SiftingAppender">
        <discriminator class="ch.qos.logback.classic.sift.MDCBasedDiscriminator">
            <key>hospitalCode</key>
            <defaultValue>ltkjpeis</defaultValue>
        </discriminator>
        <sift>
            <appender name="FILE_ERROR-${hospitalCode}" class="ch.qos.logback.core.rolling.RollingFileAppender">
                <file>${log.path}/${hospitalCode}/sys-error.log</file>
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!-- 日志文件名格式 -->
            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
            <!-- 日志最大的历史 60天 -->
                    <fileNamePattern>${log.path}/${hospitalCode}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
            <maxHistory>15</maxHistory>
        </rollingPolicy>
        <encoder>
            <pattern>${log.pattern}</pattern>
        </encoder>
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <!-- 过滤的级别 -->
            <level>ERROR</level>
            <!-- 匹配时的操作：接收（记录） -->
            <onMatch>ACCEPT</onMatch>
            <!-- 不匹配时的操作：拒绝（不记录） -->
            <onMismatch>DENY</onMismatch>
        </filter>
    </appender>
        </sift>
    </appender>

    <!-- 用户访问日志输出  -->
    <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${log.path}/sys-user.log</file>
    <!-- 用户操作日志，动态院区 -->
    <appender name="SIFT_USER" class="ch.qos.logback.classic.sift.SiftingAppender">
        <discriminator class="ch.qos.logback.classic.sift.MDCBasedDiscriminator">
            <key>hospitalCode</key>
            <defaultValue>ltkjpeis</defaultValue>
        </discriminator>
        <sift>
            <appender name="FILE_USER-${hospitalCode}" class="ch.qos.logback.core.rolling.RollingFileAppender">
                <file>${log.path}/${hospitalCode}/sys-user.log</file>
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!-- 按天回滚 daily -->
            <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
            <!-- 日志最大的历史 60天 -->
                    <fileNamePattern>${log.path}/${hospitalCode}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
            <maxHistory>60</maxHistory>
        </rollingPolicy>
        <encoder>
            <pattern>${log.pattern}</pattern>
        </encoder>
    </appender>
<!--    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">-->
<!--        &lt;!&ndash; ... 其他配置 ... &ndash;&gt;-->
<!--        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">-->
<!--            &lt;!&ndash; ... 其他配置 ... &ndash;&gt;-->
<!--            &lt;!&ndash; 设置最长保留期限为 7 天 &ndash;&gt;-->
<!--            <maxDays>7</maxDays>-->
<!--        </rollingPolicy>-->
<!--    </appender>-->

        </sift>
    </appender>

    <!-- 系统模块日志级别控制  -->
    <logger name="com.ltkj" level="info"/>
    <!-- Spring日志级别控制  -->
    <logger name="org.springframework" level="warn"/>

    <!-- root 日志 -->
    <root level="info">
        <appender-ref ref="console"/>
    </root>

    <!--系统操作日志-->
    <root level="info">
        <appender-ref ref="file_info"/>
        <appender-ref ref="file_error"/>
        <appender-ref ref="SIFT_INFO"/>
        <appender-ref ref="SIFT_ERROR"/>
    </root>

    <!--系统用户操作日志-->
    <logger name="sys-user" level="info">
        <appender-ref ref="sys-user"/>
        <appender-ref ref="SIFT_USER"/>
    </logger>

</configuration>

 ltkj-framework/src/main/java/com/ltkj/framework/interceptor/DBChangeInterceptor.java

@@ -11,6 +11,7 @@
import com.ltkj.framework.config.DruidConfig;
import com.ltkj.hosp.domain.DictHosp;
import com.ltkj.hosp.service.IDictHospService;
import org.jboss.logging.MDC;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
@@ -63,6 +64,8 @@
            dataSourceConfig.addDataSource(hosp.getDbname());
//            druidConfig.addDataSource(hosp.getDbname());
            DataSourceContextHolder.setDataSourceKey(hosp.getDbname());
            // 设置到 MDC 中
            MDC.put("hospitalCode",hosp.getCode());
        } catch (IOException e) {
            return false;
        }
@@ -75,5 +78,6 @@
        DataSourceContextHolder.setDataSourceKey("default");
        DataSourceContextHolder.clear();
        HandlerInterceptor.super.afterCompletion(request, response, handler, ex);
        MDC.remove("hospitalCode");
    }
}

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

@@ -319,7 +319,7 @@
            "  \n" +
            "FROM\n" +
            "  vi_his_patientinfo a\n" +
            "WHERE  a.PATIENTTYPE=3 AND a.GH_PATIENTNO =#{tjNum} AND a.HOSPITALID = #{hosp}")
            "WHERE  a.PATIENTTYPE=3 AND LOCATE(#{tjNum},.GH_PATIENTNO)  AND a.HOSPITALID = #{hosp}")
    List<Map<String, Object>> sysgetCcXZxYyLtkjHysqdByLisVi(@Param("tjNum") String tjNum,@Param("hosp") String hosp);


@@ -465,7 +465,7 @@
            "  a.SQRJ 申请时间,\n" +
            "  a.JCBW 检查部位\n" +
            "FROM\n" +
            "ris.V_TJ_JCBGXX_NEWTJ a  WHERE trim(a.HIS_ID)=#{tjNum} AND a.HOSTPITALID = #{hosp}")
            "ris.V_TJ_JCBGXX_NEWTJ a  WHERE INSTR(trim(a.HIS_ID),#{tjNum}) > 0  AND a.HOSTPITALID = #{hosp}")
    List<Map<String, Object>> sysgetCcXZxYyPacsLtkjExamJcsqd(@Param("tjNum") String tjNum,@Param("hosp") String hosp);