From 959a154ce0df9e029c6efaef8be38ca8dc699dad Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 07 七月 2025 17:13:50 +0800
Subject: [PATCH] 查看人员列表以及查看报告数据去除核收判断
---
ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml | 2 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
index 6ac4969..785af32 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
@@ -87,7 +87,7 @@
wrapper.eq(TjOrder::getTjNumber,tjNum);
List<TjOrder> list = tjOrderService.list(wrapper);
if (list.isEmpty()){
- return AjaxResult.error();
+ return AjaxResult.error("鎶ュ憡鏈牳鏀�,璇锋牳鏀跺悗鏌ョ湅");
}
TjOrder tjOrder = tjOrderService.getOrderByTjNum(tjNum);
TjCustomer tjCustomer = tjCustomerMapper.selectById( tjOrder.getUserId());
@@ -104,7 +104,7 @@
public AjaxResult reportData(@RequestBody String json){
String tjNum = JSONUtil.parseObj(json).getStr("tjNum");
LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjOrder::getHeshouStatus,1);
+// wrapper.eq(TjOrder::getHeshouStatus,1);
wrapper.eq(TjOrder::getTjNumber,tjNum);
List<TjOrder> list = tjOrderService.list(wrapper);
if (list.isEmpty()){
diff --git a/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml b/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml
index 8a63913..b4f1898 100644
--- a/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml
@@ -308,7 +308,7 @@
JOIN tj_customer c ON o.user_id = c.cus_id
LEFT JOIN tj_report r ON o.tj_number = r.tj_number
WHERE
- c.cus_idcard = #{card} AND c.cus_name = #{name} AND c.deleted = 0 and o.heshou_status = 1
+ c.cus_idcard = #{card} AND c.cus_name = #{name} AND c.deleted = 0
ORDER BY
o.create_time DESC
</select>
--
Gitblit v1.8.0