From 8fe8dc82abf3bb3622c4ce5e31c762775917a64d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=81=92?= <3226558941@qq.com> Date: Mon, 9 Oct 2023 14:05:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=BB=A3=E7=A0=81=E7=A7=BB=E6=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NurseAppLoginController.java | 18 ++++++++++ .../nurseapplogin/NurseAppLoginMapper.java | 10 ++++++ .../nurseapplogin/NurseAppLoginService.java | 12 +++++++ .../impl/NurseAppLoginServiceImpl.java | 22 +++++++++--- .../nurseapplogin/NurseAppLoginMapper.xml | 34 +++++++++++++++++++ 5 files changed, 92 insertions(+), 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 3929cf1..d93e663 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 @@ -2,9 +2,11 @@ package com.xinelu.applet.controller.nurseapplogin; import com.xinelu.applet.dto.appletlogin.StationItemInfoDTO; import com.xinelu.applet.service.nurseapplogin.NurseAppLoginService; +import com.xinelu.applet.vo.nursepersonapplogin.OrderAndItemVO; import com.xinelu.common.annotation.MobileRequestAuthorization; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.custominterface.Query; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.regex.RegexUtil; @@ -15,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; import java.util.Objects; ; @@ -80,5 +83,20 @@ public class NurseAppLoginController extends BaseController { } return nurseAppLoginService.nurseAppPersonal(patientId); } + + /** + * App查询预约服务订单 + * + * @param patientId 用户id + * @param orderStatus 预约订单状态 + * @return 结果 + */ + @MobileRequestAuthorization + @GetMapping("/appServiceOrder") + public TableDataInfo selectAppServiceOrder(Long patientId, String orderStatus) { + startPage(); + List appointmentOrderDetails = nurseAppLoginService.selectAppServiceOrderItem(patientId, orderStatus); + return getDataTable(appointmentOrderDetails); + } } diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/mapper/nurseapplogin/NurseAppLoginMapper.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/mapper/nurseapplogin/NurseAppLoginMapper.java index 206c24e..b2c35d8 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/mapper/nurseapplogin/NurseAppLoginMapper.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/mapper/nurseapplogin/NurseAppLoginMapper.java @@ -2,6 +2,7 @@ package com.xinelu.applet.mapper.nurseapplogin; import com.xinelu.applet.vo.nurseapplogin.PatientAndDiseaseVO; +import com.xinelu.applet.vo.nursepersonapplogin.OrderAndItemVO; import com.xinelu.manage.domain.goodsOrder.GoodsOrder; import org.apache.ibatis.annotations.Param; @@ -22,6 +23,15 @@ public interface NurseAppLoginMapper { */ PatientAndDiseaseVO getPatientDiseaseByPatientId(@Param("patientId") Long patientId); + /** + * 预约查询预约订单明细 + * + * @param patientId 预约订单明细主键 + * @param orderStatus 预约状态 + * @return 预约订单明细 + */ + List selectAppointmentOrderDetailsByPatientId(@Param("patientId") Long patientId, @Param("orderStatus") String orderStatus); + /** * 查询信息完善标识符 * diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/NurseAppLoginService.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/NurseAppLoginService.java index c5a43f5..a0365ac 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/NurseAppLoginService.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/NurseAppLoginService.java @@ -1,8 +1,11 @@ package com.xinelu.applet.service.nurseapplogin; import com.xinelu.applet.dto.appletlogin.StationItemInfoDTO; +import com.xinelu.applet.vo.nursepersonapplogin.OrderAndItemVO; import com.xinelu.common.core.domain.AjaxResult; +import java.util.List; + /** * @Description APP登录注册业务层 * @Author zh @@ -33,4 +36,13 @@ public interface NurseAppLoginService { * @return 结果 */ AjaxResult nurseAppPersonal(Long patientId); + + /** + * App查询预约服务订单 + * + * @param patientId 用户id + * @param orderStatus 预约订单状态 + * @return 结果 + */ + List selectAppServiceOrderItem(Long patientId, String orderStatus); } 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 e985b3c..fb36d7a 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 @@ -8,6 +8,7 @@ import com.xinelu.applet.utils.AppointmentTimeUtil; import com.xinelu.applet.vo.appletlogin.NurserStationItemConsumableVO; import com.xinelu.applet.vo.appletlogin.NurserStationItemInfoVO; import com.xinelu.applet.vo.nurseapplogin.PatientAndDiseaseVO; +import com.xinelu.applet.vo.nursepersonapplogin.OrderAndItemVO; import com.xinelu.applet.vo.specialdisease.WeekDaysVO; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.enums.AppointmentTimeIntervalEnum; @@ -26,10 +27,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; import java.time.LocalTime; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -180,4 +178,20 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService { patientDisease.setEvaluatedCount(evaluatedCount); return AjaxResult.success(patientDisease); } + + /** + * App查询预约服务订单 + * + * @param patientId 用户id + * @param orderStatus 预约订单状态 + * @return 结果 + */ + @Override + public List selectAppServiceOrderItem(Long patientId, String orderStatus) { + List appointmentOrderDetails = new ArrayList<>(); + if (Objects.isNull(patientId) && StringUtils.isBlank(orderStatus)) { + return appointmentOrderDetails; + } + return nurseAppLoginMapper.selectAppointmentOrderDetailsByPatientId(patientId, orderStatus); + } } \ No newline at end of file diff --git a/xinelu-nurse-applet/src/main/resources/mapper/applet/nurseapplogin/NurseAppLoginMapper.xml b/xinelu-nurse-applet/src/main/resources/mapper/applet/nurseapplogin/NurseAppLoginMapper.xml index f894d49..3641690 100644 --- a/xinelu-nurse-applet/src/main/resources/mapper/applet/nurseapplogin/NurseAppLoginMapper.xml +++ b/xinelu-nurse-applet/src/main/resources/mapper/applet/nurseapplogin/NurseAppLoginMapper.xml @@ -65,6 +65,40 @@ + +