xinyilu/xinelu-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

小程序个人中心角标修改

Browse Source
This commit is contained in:
zhangheng 2023-11-14 13:13:23 +08:00
parent 21cdddd964
commit 86ff47eb05
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xinelu-nurse-applet/src/main/java/com/xinelu/applet/mapper/nurseapplogin/NurseAppLoginMapper.java
View File

@ -71,7 +71,7 @@ public interface NurseAppLoginMapper {
* @param patientId id * @param patientId id
* @return GoodsOrder * @return GoodsOrder
*/ */
List<GoodsOrder> selectGoodsOrderListByPatient(Long patientId); List<GoodsOrder> selectGoodsOrderListByPatient(@Param("patientId") Long patientId,@Param("orderType") String orderType);
/** /**
* 预约取消 * 预约取消

8
xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java
View File

@ -13,11 +13,7 @@ import com.xinelu.applet.vo.nurseapplogin.PatientAndDiseaseVO;
import com.xinelu.applet.vo.nursepersonapplogin.OrderAndItemVO; import com.xinelu.applet.vo.nursepersonapplogin.OrderAndItemVO;
import com.xinelu.applet.vo.specialdisease.WeekDaysVO; import com.xinelu.applet.vo.specialdisease.WeekDaysVO;
import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.domain.AjaxResult;
import com.xinelu.common.core.domain.R; import com.xinelu.common.enums.*;
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.exception.ServiceException; import com.xinelu.common.exception.ServiceException;
import com.xinelu.common.utils.AgeUtil; import com.xinelu.common.utils.AgeUtil;
import com.xinelu.common.utils.http.HttpService; import com.xinelu.common.utils.http.HttpService;
@ -211,7 +207,7 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService {
// 更新签约编号 // 更新签约编号
setSignInfo(patientDisease); setSignInfo(patientDisease);
//查询所有商品订单 //查询所有商品订单
List<GoodsOrder> goodsOrders = nurseAppLoginMapper.selectGoodsOrderListByPatient(patientId); List<GoodsOrder> goodsOrders = nurseAppLoginMapper.selectGoodsOrderListByPatient(patientId, OrderTypeEnum.HEALTH_CONSULTATION.getInfo());
if (CollectionUtils.isEmpty(goodsOrders)) { if (CollectionUtils.isEmpty(goodsOrders)) {
return AjaxResult.success(patientDisease); return AjaxResult.success(patientDisease);
} }

5
xinelu-nurse-applet/src/main/resources/mapper/applet/nurseapplogin/NurseAppLoginMapper.xml
View File

@ -141,7 +141,7 @@
from patient_info from patient_info
<where> <where>
del_flag = 0 del_flag = 0
<if test="patientId != null and patientId != ''"> <if test="patientId != null">
and id = #{patientId} and id = #{patientId}
</if> </if>
</where> </where>
@ -155,6 +155,9 @@
<if test="patientId != null"> <if test="patientId != null">
patient_id = #{patientId} patient_id = #{patientId}
</if> </if>
<if test="orderType != null and orderType!= ''">
AND order_type &lt;&gt; #{orderType}
</if>
</where> </where>
</select> </select>