From ec2bb08f0aad10bbf1f133046d8e9943be3a6d72 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 26 六月 2024 15:34:44 +0800
Subject: [PATCH] zjh 本地 2024/06/26 --3修改签到撤销接口不判断作废状态
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index 5a4ab70..1d4157b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -1432,7 +1432,7 @@
HashMap<String, Object> hisRequestParams = new HashMap<>();
// 涓嶅湪闇�瑕佽韩浠借瘉鍙�
// hisRequestParams.put("card_no",tjCustomer.getCusIdcard());
- hisRequestParams.put("patientId",tjCustomer.getCardId());
+ hisRequestParams.put("patientId",tjOrder.getCardId());
AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data");
@@ -1450,6 +1450,7 @@
LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(LtkjJianchajianyanTree::getSqdh, sqdhs)
.in(LtkjJianchajianyanTree::getXmfl, xmfls)
+ .eq(LtkjJianchajianyanTree::getCardId,tjOrder.getCardId())
.groupBy(LtkjJianchajianyanTree::getType)
.select(LtkjJianchajianyanTree::getFyhj);
List<LtkjJianchajianyanTree> results = ltkjJianchajianyanTreeService.list(queryWrapper);
@@ -1605,6 +1606,7 @@
return AjaxResult.success("璇ョ敤鎴锋殏鏃舵病鏈変綋妫�鏁版嵁");
}
List<TjOrderDetail> tjOrderDetails = detailService.getTjOrderDetailListInProParentIdList(String.valueOf(one.getOrderId()), proParentIdList);
+ List<TjOrderDetail> tjOrderDetailList=new ArrayList<>();
TjCustomer customer = tjCustomerService.getById(one.getUserId());
if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
@@ -1680,6 +1682,7 @@
} else {
tjOrderDetail.setDoctorName(null);
}
+ tjOrderDetailList.add(tjOrderDetail);
}
}
Map<String, Object> map = new HashMap<>();
@@ -1699,7 +1702,7 @@
} else {
map.put("xiaoJieIds", null);
}
- map.put("sons", tjOrderDetails);
+ map.put("sons", tjOrderDetailList);
map.put("xiaoJie", adviceList);
map.put("remark", remark.getRemark());
--
Gitblit v1.8.0