From 027c1328165a0d37a778ec7f58760bb0fe1ffebb Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 30 七月 2025 17:00:01 +0800
Subject: [PATCH] zjh20250730-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java | 8 ++++----
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java | 2 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java | 2 +-
ltkj-admin/src/main/java/com/ltkj/web/config/captcha/LogTestRunner.java | 16 ++++++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java | 2 ++
ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml | 4 +++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 13 +++++++++----
ltkj-admin/src/main/resources/logback.xml | 4 ++--
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java | 4 ++--
9 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/captcha/LogTestRunner.java b/ltkj-admin/src/main/java/com/ltkj/web/config/captcha/LogTestRunner.java
new file mode 100644
index 0000000..fa3d04b
--- /dev/null
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/captcha/LogTestRunner.java
@@ -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("=== 鎵嬪姩瑙﹀彂鏃ュ織褰掓。娴嬭瘯 ===");
+ }
+}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
index 083f3d5..d306a39 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
+++ b/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();
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
index 1abfb5a..eb40dcf 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
+++ b/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<>();
diff --git a/ltkj-admin/src/main/resources/logback.xml b/ltkj-admin/src/main/resources/logback.xml
index c54fbff..6f91faa 100644
--- a/ltkj-admin/src/main/resources/logback.xml
+++ b/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>
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java
index 1d1d966..c1932e7 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java
+++ b/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;
/**
* 瀛愰」鐩�
*/
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
index 5efbc69..cf693dd 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
+++ b/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" +
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
index fc5f135..ae2079a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
+++ b/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();
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
index 9c58453..6c0b292 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
+++ b/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
diff --git a/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml b/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml
index 50e8ee1..97b81e9 100644
--- a/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml
@@ -236,7 +236,9 @@
<where>
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>
+ 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>
--
Gitblit v1.8.0