From ce3a4e08eb570bc0f928b6b5af4f615373a19c46 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 03 七月 2024 17:30:07 +0800
Subject: [PATCH] zjh 2024/07/3-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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..a7a40fe 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,31 +1432,33 @@
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");
- ArrayList<String> sqdhs = new ArrayList<>();
- ArrayList<String> xmfls = new ArrayList<>();
+// ArrayList<String> sqdhs = new ArrayList<>();
+// ArrayList<String> xmfls = new ArrayList<>();
BigDecimal cateFeeAll = BigDecimal.ZERO;
for (Map<String, String> datum : data) {
- String advId = datum.get("Adv_Id").split("_")[1];
+// String advId = datum.get("Adv_Id").split("_")[1];
BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
- String cateCode = datum.get("CateCode");
+// String cateCode = datum.get("CateCode");
cateFeeAll = cateFeeAll.add(cateFee);
- sqdhs.add(advId);
- xmfls.add(cateCode);
+// sqdhs.add(advId);
+// xmfls.add(cateCode);
}
- LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
+ /* 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);
BigDecimal total = results.stream()
.map(item -> new BigDecimal(item.getFyhj()))
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- if (cateFeeAll.compareTo(total) != 0){
+ .reduce(BigDecimal.ZERO, BigDecimal::add);*/
+ BigDecimal fyhj = ltkjJianchajianyanTreeService.getLtkjJianchajianyanTreeFyhjByCardId(tjOrder.getCardId());
+ if (cateFeeAll.compareTo(fyhj) != 0){
return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
}
@@ -1605,6 +1607,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 +1683,7 @@
} else {
tjOrderDetail.setDoctorName(null);
}
+ tjOrderDetailList.add(tjOrderDetail);
}
}
Map<String, Object> map = new HashMap<>();
@@ -1699,7 +1703,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