From bd94f17a788da5fde253ce877a2d79de5d04df9c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 15 八月 2025 17:39:02 +0800
Subject: [PATCH] zjh202500815
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 17 +----
ltkj-framework/src/main/java/com/ltkj/framework/interceptor/DBChangeInterceptor.java | 4 +
ltkj-admin/src/main/resources/logback.xml | 152 ++++++++++++++++++++++++--------------------------
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 4
4 files changed, 83 insertions(+), 94 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
index 2d3af23..4afc539 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
+++ b/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);
- }*/
}
}
}
diff --git a/ltkj-admin/src/main/resources/logback.xml b/ltkj-admin/src/main/resources/logback.xml
index 6f91faa..cf551f6 100644
--- a/ltkj-admin/src/main/resources/logback.xml
+++ b/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>
- <!-- 寰幆鏀跨瓥锛氬熀浜庢椂闂村垱寤烘棩蹇楁枃浠� -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
- <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
- <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>
+ <!-- 绯荤粺 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}/${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>
- <!-- 寰幆鏀跨瓥锛氬熀浜庢椂闂村垱寤烘棩蹇楁枃浠� -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
- <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
- <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>
+ <!-- 绯荤粺 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}/${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>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 鎸夊ぉ鍥炴粴 daily -->
- <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
+ <!-- 鐢ㄦ埛鎿嶄綔鏃ュ織锛屽姩鎬侀櫌鍖� -->
+ <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">
+ <fileNamePattern>${log.path}/${hospitalCode}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <maxHistory>60</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${log.pattern}</pattern>
+ </encoder>
+ </appender>
+ </sift>
</appender>
-<!-- <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">-->
-<!-- <!– ... 鍏朵粬閰嶇疆 ... –>-->
-<!-- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">-->
-<!-- <!– ... 鍏朵粬閰嶇疆 ... –>-->
-<!-- <!– 璁剧疆鏈�闀夸繚鐣欐湡闄愪负 7 澶� –>-->
-<!-- <maxDays>7</maxDays>-->
-<!-- </rollingPolicy>-->
-<!-- </appender>-->
-
- <!-- 绯荤粺妯″潡鏃ュ織绾у埆鎺у埗 -->
+ <!-- 绯荤粺妯″潡鏃ュ織绾у埆鎺у埗 -->
<logger name="com.ltkj" level="info"/>
- <!-- Spring鏃ュ織绾у埆鎺у埗 -->
<logger name="org.springframework" level="warn"/>
+ <!-- root 鏃ュ織 -->
<root level="info">
<appender-ref ref="console"/>
+ <appender-ref ref="SIFT_INFO"/>
+ <appender-ref ref="SIFT_ERROR"/>
</root>
- <!--绯荤粺鎿嶄綔鏃ュ織-->
- <root level="info">
- <appender-ref ref="file_info"/>
- <appender-ref ref="file_error"/>
- </root>
-
- <!--绯荤粺鐢ㄦ埛鎿嶄綔鏃ュ織-->
+ <!-- 绯荤粺鐢ㄦ埛鎿嶄綔鏃ュ織 -->
<logger name="sys-user" level="info">
- <appender-ref ref="sys-user"/>
+ <appender-ref ref="SIFT_USER"/>
</logger>
+
</configuration>
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/interceptor/DBChangeInterceptor.java b/ltkj-framework/src/main/java/com/ltkj/framework/interceptor/DBChangeInterceptor.java
index 37f872e..f1c4a2a 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/interceptor/DBChangeInterceptor.java
+++ b/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");
}
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
index 81ccbf8..e02680d 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
+++ b/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);
--
Gitblit v1.8.0