Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://182.92.166.109:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
This commit is contained in:
commit
e3099218b1
@ -39,6 +39,15 @@ public class HealthConsultationController extends BaseController {
|
||||
return healthConsultationService.selectDepartment();
|
||||
}
|
||||
|
||||
/**
|
||||
* 健康咨询-预约医生(无分页)
|
||||
*/
|
||||
@MobileRequestAuthorization
|
||||
@GetMapping("/selectDepartmentNoPage")
|
||||
public AjaxResult selectDepartmentNoPage() {
|
||||
return AjaxResult.success(healthConsultationService.selectDepartmentNoPage());
|
||||
}
|
||||
|
||||
/**
|
||||
* 健康咨询-预约医生-单查科室人员
|
||||
*/
|
||||
|
||||
@ -3,6 +3,7 @@ package com.xinelu.applet.service.healthconsultation;
|
||||
|
||||
|
||||
import com.xinelu.applet.vo.healthconsultation.HealthConsultationOrderDTO;
|
||||
import com.xinelu.applet.vo.healthconsultation.HealthConsultationVO;
|
||||
import com.xinelu.common.core.domain.AjaxResult;
|
||||
import com.xinelu.common.core.page.TableDataInfo;
|
||||
import com.xinelu.manage.domain.hospitalpersoninfo.HospitalPersonInfo;
|
||||
@ -23,6 +24,13 @@ public interface HealthConsultationService {
|
||||
*/
|
||||
TableDataInfo selectDepartment();
|
||||
|
||||
/**
|
||||
* 健康咨询-预约医生(无分页)
|
||||
*
|
||||
* @return AjaxResult
|
||||
*/
|
||||
List<HealthConsultationVO> selectDepartmentNoPage();
|
||||
|
||||
/**
|
||||
* 单查科室人员
|
||||
*
|
||||
|
||||
@ -84,6 +84,22 @@ public class HealthConsultationServiceImpl implements HealthConsultationService
|
||||
return pageServiceUtil.getDataTable(healthConsultation);
|
||||
}
|
||||
|
||||
/**
|
||||
* 健康咨询-预约医生(无分页)
|
||||
*
|
||||
* @return AjaxResult
|
||||
*/
|
||||
@Override
|
||||
public List<HealthConsultationVO> selectDepartmentNoPage() {
|
||||
//查询海报及科室
|
||||
List<PoserInfo> poserList = poserInfoMapper.selectPoserListByModuleTyp(PoserModuleTypeEnum.HEALTH_CONSUTION_MODULE.getInfo());
|
||||
List<HealthConsultationVO> healthConsultation = healthConsultationMapper.selectHospitalDepartmentList();
|
||||
if (CollectionUtils.isNotEmpty(healthConsultation)) {
|
||||
healthConsultation.get(0).setPoserInfoList(poserList);
|
||||
}
|
||||
return healthConsultation;
|
||||
}
|
||||
|
||||
/**
|
||||
* 单查科室人员
|
||||
*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user