From 35492c6595e9585e54e25a97eda08e679efa1c12 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 19 七月 2024 18:08:10 +0800
Subject: [PATCH] zjh 2024/07/19-2
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java | 2 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java | 4 ++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 16 +++++++++++-----
ltkj-admin/src/main/resources/application.yml | 2 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java | 4 ++--
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java | 2 +-
6 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 5aac19d..f66af80 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -34,6 +34,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
import lombok.var;
import org.aspectj.weaver.AjAttribute;
import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +47,7 @@
import java.util.*;
import java.util.stream.Collectors;
+import static com.ltkj.framework.datasource.DynamicDataSourceContextHolder.log;
import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.save;
import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.setClipRect;
@@ -56,6 +58,7 @@
@RestController
@RequestMapping ("/check")
@Api (tags = "鎬绘鍖诲笀鐩稿叧鎺ュ彛")
+@Slf4j
public class TjCheckController {
@Resource
private ITjOrderService orderService;
@@ -483,16 +486,19 @@
AjaxResult results = jcsqdService.getTjJcProByHisCall("浣撴涓績",order.getCardId(),"''",100,1,"'1'");
DynamicDataSourceContextHolder.clearDataSourceType();
+ log.info("妫�鏌ラ」鐩煡璇㈣繑鍥炲��: "+results.toString());
if (Integer.parseInt(results.get("code").toString()) == 200) {
List<Map<String, Object>> datas = (List<Map<String, Object>>) results.get("data");
if(null !=datas && datas.size()>0){
+ jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId());
+ jcbgdService.deletedLtkjJcbgdByTjhAndTmh(order.getCardId());
for (Map<String, Object> objectMap : datas) {
- LtkjExamJcsqd jybgid = jcsqdService.getLtkjJcsqdByTjhAndTmh(order.getCardId(), objectMap.get("JCBGID").toString());
- if (null != jybgid) {
- jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId(), objectMap.get("JCBGID").toString());
- jcbgdService.deletedLtkjJcbgdByTjhAndTmh(jybgid.getTmh());
- }
+// LtkjExamJcsqd jybgid = jcsqdService.getLtkjJcsqdByTjhAndTmh(order.getCardId(), objectMap.get("JCBGID").toString());
+// if (null != jybgid) {
+// jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId(), objectMap.get("JCBGID").toString());
+// jcbgdService.deletedLtkjJcbgdByTjhAndTmh(jybgid.getTmh());
+// }
LtkjExamJcbgd jcbgd=new LtkjExamJcbgd();
jcbgd.setTjh(order.getCardId());
if(null !=objectMap.get("JCBGID") || !objectMap.get("JCBGID").equals(""))
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 967aa1c..343d3cf 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -5,4 +5,4 @@
#xiaochengxu 娉惧窛鍘块儴缃插皬绋嬪簭鐜浣跨敤
spring:
profiles:
- active: dev
\ No newline at end of file
+ active: prod
\ No newline at end of file
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
index 0d98f38..3caa03c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
@@ -20,7 +20,7 @@
@DataSource(value = DataSourceType.MASTER)
public interface LtkjExamJcbgdMapper extends BaseMapper<LtkjExamJcbgd> {
- @Delete ("DELETE FROM ltkj_exam_jcbgd WHERE tmh=#{tmh} ")
+ @Delete ("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tmh} ")
void deletedLtkjJcbgdByTjhAndTmh(String tmh);
@Select ("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='妫�鏌�' GROUP BY a.sqdh")
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
index 0bf99e3..50424ae 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
@@ -25,8 +25,8 @@
@Select ("SELECT * FROM ltkj_exam_jcsqd a WHERE a.tjh=#{tjh} AND a.tmh=#{tmh} ")
LtkjExamJcsqd getLtkjJcsqdByTjhAndTmh(@Param("tjh") String tjh,@Param("tmh") String tmh);
- @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} AND tmh=#{tmh} ")
- void deletedLtkjJcsqdByTjhAndTmh(@Param("tjh")String tjh,@Param("tmh")String tmh);
+ @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh}")
+ void deletedLtkjJcsqdByTjhAndTmh(@Param("tjh")String tjh);
@Select("SELECT * FROM ltkj_exam_jcsqd a WHERE a.tjh=#{tjh}")
List<LtkjExamJcsqd> getLtkjJcsqdByTjh(String tjh);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java
index 8e5c3d8..291f651 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java
@@ -19,7 +19,7 @@
LtkjExamJcsqd getLtkjJcsqdByTjhAndTmh(String tjh, String tmh);
- void deletedLtkjJcsqdByTjhAndTmh(String tjh,String tmh);
+ void deletedLtkjJcsqdByTjhAndTmh(String tjh);
List<LtkjExamJcsqd> getLtkjJcsqdByTjh(String tjh);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java
index 946e51a..5598e72 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java
@@ -46,8 +46,8 @@
}
@Override
- public void deletedLtkjJcsqdByTjhAndTmh(String tjh, String tmh) {
- mapper.deletedLtkjJcsqdByTjhAndTmh(tjh,tmh);
+ public void deletedLtkjJcsqdByTjhAndTmh(String tjh) {
+ mapper.deletedLtkjJcsqdByTjhAndTmh(tjh);
}
@Override
--
Gitblit v1.8.0