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 b3b6897..57ed9e4 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 @@ -71,7 +71,7 @@ public interface NurseAppLoginMapper { * @param patientId id * @return GoodsOrder */ - List selectGoodsOrderListByPatient(Long patientId); + List selectGoodsOrderListByPatient(@Param("patientId") Long patientId,@Param("orderType") String orderType); /** * 预约取消 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 dd9d02a..5ea70b3 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 @@ -13,11 +13,7 @@ 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.core.domain.R; -import com.xinelu.common.enums.AppointmentTimeIntervalEnum; -import com.xinelu.common.enums.ConfirmRefundStatusEnum; -import com.xinelu.common.enums.GooodsOrderStatusEnum; -import com.xinelu.common.enums.OrderStatusEnum; +import com.xinelu.common.enums.*; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.AgeUtil; import com.xinelu.common.utils.http.HttpService; @@ -211,7 +207,7 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService { // 更新签约编号 setSignInfo(patientDisease); //查询所有商品订单 - List goodsOrders = nurseAppLoginMapper.selectGoodsOrderListByPatient(patientId); + List goodsOrders = nurseAppLoginMapper.selectGoodsOrderListByPatient(patientId, OrderTypeEnum.HEALTH_CONSULTATION.getInfo()); if (CollectionUtils.isEmpty(goodsOrders)) { return AjaxResult.success(patientDisease); } 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 8b75264..9e3849c 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 @@ -141,7 +141,7 @@ from patient_info del_flag = 0 - + and id = #{patientId} @@ -155,6 +155,9 @@ patient_id = #{patientId} + + AND order_type <> #{orderType} +