From 7b11884c74f42063f0ef49fe53e40b9e55a8b08f Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Tue, 7 Nov 2023 13:29:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/nurseapplogin/NurseAppLoginController.java | 2 +- .../service/nurseapplogin/impl/NurseAppLoginServiceImpl.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nurseapplogin/NurseAppLoginController.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nurseapplogin/NurseAppLoginController.java index 8f92a18..b10cc3b 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nurseapplogin/NurseAppLoginController.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nurseapplogin/NurseAppLoginController.java @@ -51,7 +51,7 @@ public class NurseAppLoginController extends BaseController { } /** - * 查询护理人列表信息（会员小程序和App共用） + * 查询护理人列表信息-护理服务查询个人信息使用（会员小程序和App共用） * * @param patientId 用户id * @return 护理人列表集合 diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java index 513acd1..b237c4c 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java @@ -207,7 +207,6 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService { } // 更新签约编号 setSignInfo(patientDisease); - //查询所有商品订单 List goodsOrders = nurseAppLoginMapper.selectGoodsOrderListByPatient(patientId); if (CollectionUtils.isEmpty(goodsOrders)) { @@ -217,11 +216,9 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService { long waitPayCount = goodsOrders.stream().filter(Objects::nonNull).filter(item -> StringUtils.isNotBlank(item.getOrderStatus())).filter(item -> GooodsOrderStatusEnum.WAIT_PAY.getInfo().equals(item.getOrderStatus())).count(); long waitReceivedGoodsCount = goodsOrders.stream().filter(Objects::nonNull).filter(item -> StringUtils.isNotBlank(item.getOrderStatus())).filter(item -> GooodsOrderStatusEnum.WAIT_RECEIVED_GOODS.getInfo().equals(item.getOrderStatus())).count(); long receivedGoodsCount = goodsOrders.stream().filter(Objects::nonNull).filter(item -> StringUtils.isNotBlank(item.getOrderStatus())).filter(item -> GooodsOrderStatusEnum.RECEIVED_GOODS.getInfo().equals(item.getOrderStatus())).count(); - long evaluatedCount = goodsOrders.stream().filter(Objects::nonNull).filter(item -> StringUtils.isNotBlank(item.getOrderStatus())).filter(item -> GooodsOrderStatusEnum.EVALUATED.getInfo().equals(item.getOrderStatus())).count(); patientDisease.setWaitPayCount(waitPayCount); patientDisease.setWaitReceivedGoodsCount(waitReceivedGoodsCount); patientDisease.setReceivedGoodsCount(receivedGoodsCount); - patientDisease.setEvaluatedCount(evaluatedCount); return AjaxResult.success(patientDisease); }