From 0a469fa5898ac2b63b860d17ac10c0ebf534d82f Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 27 六月 2025 17:49:38 +0800
Subject: [PATCH] zjh20250627
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java | 11 +++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 19 +++++++++++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java | 6 +++---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 2 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java | 10 ++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java | 4 ++++
6 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index 8285d91..a6aadee 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -133,7 +133,7 @@
String code1 = object1.getStr("ResultCode");
if (code1.equals("0")) {
JSONArray resultDatas = object1.getJSONArray("ResultData");
- if (null != resultDatas && resultDatas.size() > 0) {
+ if (null != resultDatas && !resultDatas.isEmpty()) {
Map<String, Object> resultDatasss = (Map<String, Object>) resultDatas.get(0);
String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
jzh=hisRegistrationId;
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java
index b8cbecc..e273ca2 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java
@@ -178,7 +178,7 @@
Map<String, Object> map = new HashMap<>();
if (null != xmbm && xmbm.length() == 2) {
List<DictSfxm> sfxms = dictSfxmService.getEjDictSfxmList(service.getId());
- if (null != sfxms && sfxms.size() > 0) {
+ if (null != sfxms && !sfxms.isEmpty()) {
for (DictSfxm sfxm : sfxms) {
List<DictSfxm> sfx = dictSfxmService.getSjDictSfxmList(service.getId());
sfxm.setDictSfxms(sfx);
@@ -195,9 +195,9 @@
}
if (null != xmbm && xmbm.length() == 4) {
List<DictSfxm> sfx = dictSfxmService.getSjDictSfxmList(service.getId());
- if (null != sfx && sfx.size() > 0) {
+ if (null != sfx && !sfx.isEmpty()) {
List<DictSfxm> sfxmList = sfx.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
- if (null != sfxmList && sfxmList.size() > 0) {
+ if (!sfxmList.isEmpty()) {
for (DictSfxm sfxm : sfxmList) {
DictHosp hosp = dictHospService.getById(sfxm.getYqid());
if (null != hosp) {
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 f5480c6..2230d62 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
@@ -2104,6 +2104,25 @@
}
+ @GetMapping("/zongjianyishengHuiFuyichangxiangmuanniu")
+ @ApiOperation(value = "鎬绘鎭㈠寮傚父椤圭洰鎸夐挳鎺ュ彛")
+ public AjaxResult zongjianyishengHuiFuyichangxiangmuanniu(@RequestParam String id) {
+
+ int a = ycxmService.zongjianyishengHuiFuyichangxiangmuanniu(id);
+ return AjaxResult.success(a);
+ }
+
+
+ @GetMapping("/zongjianyishengCheDiShanChuyichangxiangmuanniu")
+ @ApiOperation(value = "鎬绘褰诲簳鍒犻櫎寮傚父椤圭洰鎸夐挳鎺ュ彛")
+ public AjaxResult zongjianyishengCheDiShanChuyichangxiangmuanniu(@RequestParam String id) {
+
+ int a = ycxmService.zongjianyishengCheDiShanChuyichangxiangmuanniu(id);
+ return AjaxResult.success(a);
+ }
+
+
+
@GetMapping("/csymxmxzqtyybcjk")
@ApiOperation(value = "鍒濆椤甸潰椤圭洰閫夋嫨鍏朵粬鍘熷洜淇濆瓨鎺ュ彛")
@Transactional
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java
index baafa90..cf1f4ad 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java
@@ -5,6 +5,7 @@
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
import java.util.List;
@@ -28,4 +29,14 @@
@Select("select * FROM tj_order_ycxm WHERE tjh=#{tjNum} and deleted=1")
List<TjOrderYcxm> zongjianyishengHuiFuyichangxiangmu(String tjNum);
+
+
+
+ @Update("update tj_order_ycxm a set" +
+ " a.deleted=0 " +
+ " where a.id=id")
+ int zongjianyishengHuiFuyichangxiangmuanniu(String id);
+
+ @Delete("delete from tj_order_ycxm a where a.id=id")
+ int zongjianyishengCheDiShanChuyichangxiangmuanniu(String id);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java
index fd64221..36e14bf 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java
@@ -19,4 +19,8 @@
List<TjOrderYcxm> selectListByTjh(String tjNumber);
List<TjOrderYcxm> zongjianyishengHuiFuyichangxiangmu(String tjNum);
+
+ int zongjianyishengHuiFuyichangxiangmuanniu(String id);
+
+ int zongjianyishengCheDiShanChuyichangxiangmuanniu(String id);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java
index 39bd671..cc4fc11 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java
@@ -36,4 +36,14 @@
public List<TjOrderYcxm> zongjianyishengHuiFuyichangxiangmu(String tjNum) {
return mapper.zongjianyishengHuiFuyichangxiangmu(tjNum);
}
+
+ @Override
+ public int zongjianyishengHuiFuyichangxiangmuanniu(String id) {
+ return mapper.zongjianyishengHuiFuyichangxiangmuanniu(id);
+ }
+
+ @Override
+ public int zongjianyishengCheDiShanChuyichangxiangmuanniu(String id) {
+ return mapper.zongjianyishengCheDiShanChuyichangxiangmuanniu(id);
+ }
}
--
Gitblit v1.8.0