From aec7a21314655a61a90010684d5cf70d073476d1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 21 五月 2025 18:01:44 +0800
Subject: [PATCH] zjh20250521
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 3 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java | 4 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java | 2 +
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java | 2 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 47 +++++++++++++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjReportService.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java | 5 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java | 8 ++--
8 files changed, 67 insertions(+), 6 deletions(-)
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 c9118b5..130f15c 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
@@ -9,6 +9,7 @@
import cn.hutool.extra.pinyin.PinyinUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.injector.methods.UpdateById;
import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.utils.SecurityUtils;
@@ -665,5 +666,51 @@
}
+ @GetMapping("/getProListByBblx")
+ @ApiOperation(value = "鏌ヨ鏍囨湰瀵瑰簲椤圭洰鎴栨湭瀵瑰簲鏍囨湰鐨勯」鐩�")
+ public AjaxResult getProListByBblx(@ApiParam(value = "鏍囨湰绫诲瀷")@RequestParam(required = false) String bblx) {
+ try {
+ List<TjProject> projectList =tjProjectService.getProListByBblx(bblx);
+ return AjaxResult.success(projectList);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @GetMapping("/delProByBblx")
+ @ApiOperation(value = "鍒犻櫎椤圭洰瀵瑰簲鏍囨湰")
+ @Transactional
+ public AjaxResult delProByBblx(@ApiParam(value = "椤圭洰ID")@RequestParam(required = false) String proId) {
+ try {
+ TjProject tjProject = tjProjectService.getById(proId);
+ tjProject.setSpecimenType(null);
+ tjProjectService.updateById(tjProject);
+ return AjaxResult.success();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+
+ @GetMapping("/updateProByBblx")
+ @ApiOperation(value = "淇敼鎵�閫夐」鐩殑鏍囨湰绫诲瀷")
+ @Transactional
+ public AjaxResult updateProByBblx(@ApiParam(value = "椤圭洰ID闆嗗悎")@RequestParam(required = false) List<String> proIds,
+ @ApiParam(value = "鏍囨湰绫诲瀷")@RequestParam(required = false)String bblx) {
+ try {
+ if(null != proIds && !proIds.isEmpty()){
+ for (String proId : proIds) {
+ TjProject tjProject = tjProjectService.getById(proId);
+ tjProject.setSpecimenType(bblx);
+ tjProjectService.updateById(tjProject);
+ }
+ }
+ return AjaxResult.success();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index a16ea26..fae36ba 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -1056,8 +1056,9 @@
public AjaxResult preview(@RequestBody String data) {
String is_batch_report_use_sql = configService.selectConfigByKey("is_batch_report_use_sql");
List<String> tjNumbers = Arrays.stream(data.split(",")).collect(Collectors.toList());
+ String value = configService.selectConfigByKey("path_filePath");
if ("true".equals(is_batch_report_use_sql)) {
- return tjReportService.makeBatchReport(tjNumbers);
+ return tjReportService.makeBatchReport(tjNumbers, value);
} else {
return makeReport(tjNumbers);
}
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 a7cd135..96ea156 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
@@ -4,6 +4,7 @@
import java.util.ArrayList;
import java.util.List;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -230,6 +231,7 @@
private String isSampling;
@ApiModelProperty(value = "鏍囨湰绫诲瀷")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String specimenType;
@ApiModelProperty(value = "妫�鏌ラ儴浣�")
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 b2bde5e..6543088 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
@@ -199,4 +199,8 @@
List<Map<String ,Object>> getLisViewList();
+
+@Select("call getProListByBblx(#{bblx,mode=IN}) ")
+ List<TjProject> getProListByBblx(@Param(value ="bblx")String bblx);
+
}
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 a45d2e8..3748692 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
@@ -142,4 +142,6 @@
List<Map<String, Object>> zdysqlcx(String sql);
void zdysqlxg(String sql);
+
+ List<TjProject> getProListByBblx(String bblx);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjReportService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjReportService.java
index ad8d90f..89fdcc8 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjReportService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjReportService.java
@@ -73,5 +73,5 @@
* @param tjNumbers 浣撴鍙烽泦鍚�
* @return
*/
- AjaxResult makeBatchReport(List<String> tjNumbers);
+ AjaxResult makeBatchReport(List<String> tjNumbers,String value);
}
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 f02d8eb..f2a1502 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
@@ -347,4 +347,9 @@
tjProjectMapper.zdysqlxg(map);
}
+ @Override
+ public List<TjProject> getProListByBblx(String bblx) {
+ return tjProjectMapper.getProListByBblx(bblx);
+ }
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java
index 80d2292..e3002a0 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java
@@ -146,7 +146,7 @@
}
// @Value("${path.filePath}")
- private String value;
+// private String value;
// @Override
// public AjaxResult getTjReport(String tjNumber) {
@@ -520,8 +520,8 @@
@Override
- public AjaxResult makeBatchReport(List<String> tjNumbers) {
- return sqlGetReportToMake(tjNumbers);
+ public AjaxResult makeBatchReport(List<String> tjNumbers,String value) {
+ return sqlGetReportToMake(tjNumbers,value);
}
@@ -531,7 +531,7 @@
* @param tjNumbers
* @return
*/
- private AjaxResult sqlGetReportToMake(List<String> tjNumbers) {
+ private AjaxResult sqlGetReportToMake(List<String> tjNumbers,String value) {
// LambdaQueryWrapper<TjReport> tjReportLambdaQueryWrapper = new LambdaQueryWrapper<>();
// tjReportLambdaQueryWrapper.in(TjReport::getTjNumber, tjNumbers);
// List<TjReport> list = tjReportService.list(tjReportLambdaQueryWrapper);
--
Gitblit v1.8.0