java/PsychologicalCounseling.git

			@@ -159,7 +159,7 @@
			.isNull(MentalAppointment::getType)
			.eq(MentalAppointment::getAppointmentDay, appointmentDayYmd)
			.eq(MentalAppointment::getBeginTimePoint, beginTimePoint)
			.eq(MentalAppointment::getEndTimePoint, endTimePoint).ne(MentalAppointment::getType,1)
			.eq(MentalAppointment::getEndTimePoint, endTimePoint)
			.in(MentalAppointment::getStatusFlag, Arrays.asList(
			MentalAppointmentStatusEnum.WAIT_PAY.getCode(),
			MentalAppointmentStatusEnum.WAIT_SERVICE.getCode(),

			@@ -9,7 +9,6 @@
			import cn.stylefeng.guns.modular.business.dto.MentalTestMyTestTopicDTO;
			import cn.stylefeng.guns.modular.business.dto.MentalTestTopicAndRecordDTO;
			import cn.stylefeng.guns.modular.business.entity.MentalTestRecord;
			import cn.stylefeng.guns.modular.business.entity.MentalTestResult;
			import cn.stylefeng.guns.modular.business.entity.MentalTestTopic;
			import cn.stylefeng.guns.modular.business.entity.OrderMentalTest;
			import cn.stylefeng.guns.modular.business.service.*;
			@@ -106,12 +105,6 @@
			}

			List<Long> topicIdList = list.stream().map(o -> o.getTopicId()).collect(Collectors.toList());
			List<MentalTestResult> mentalTestResultAll = mentalTestResultService.list(
			Wrappers.<MentalTestResult>lambdaQuery()
			.eq(MentalTestResult::getUserId, userId)
			.in(MentalTestResult::getTopicId, topicIdList)
			.groupBy(MentalTestResult::getTopicId)
			);
			List<OrderMentalTest> orderMentalTestAll = orderMentalTestService.list(
			Wrappers.<OrderMentalTest>lambdaQuery()
			.eq(OrderMentalTest::getUserId, userId)

	common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/MentalAppointmentServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史