医生咨询名医修改

src/main/java/com/yihu/wlyy/repository/doctor/DoctorDao.java

@@ -125,4 +125,10 @@ public interface DoctorDao extends PagingAndSortingRepository<Doctor, Long>, Jpa
    @Query("select p from Doctor p ,DoctorFamousConsultTimesRemain w where p.code=w.doctor and p.isFamous=1 and w.consultDate = ?1  and w.timesRemain > 0  order by w.timesRemain desc")
    Page<Doctor> famousDoctorList(String date, Pageable pageRequest);
    @Query("select p from Doctor p where p.isFamous=1 and p.name like ?1 ")
    Page<Doctor> doctorFamousDoctorList(String name, Pageable pageRequest);
    @Query("select p from Doctor p where p.isFamous=1 ")
    Page<Doctor> doctorFamousDoctorList(Pageable pageRequest);
}

src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -665,7 +665,7 @@ public class FamilyContractService extends BaseService {
        sf.setDoctor(doctor);
        sf.setDoctorName(doctorName);
        sf.setDoctorHealth(doctorHealth);
        sf.setExpensesType(expenses);
        sf.setExpensesType(StringUtils.isEmpty(expenses) ? "01" : expenses);
        sf.setFamilyCode(createSignCode(doctor, hospital));
        sf.setDoctorHealthName(doctorHealthName);
        sf.setEmerMobile(emerMobile);
@@ -981,7 +981,7 @@ public class FamilyContractService extends BaseService {
            // 更新签约日期
            sf.setBegin(DateUtil.getNowDateShort());
            sf.setSignType("1");//患者发起签约
            sf.setExpensesType(expenses);//收费类别
            sf.setExpensesType(StringUtils.isEmpty(expenses) ? "01" : expenses);//收费类别
            sf.setEnd(DateUtil.strToDateShort(DateUtil.getNextYear(DateUtil.getNowDateShort(), 1)));
            //设置签约人  患者发起的签约 默认签约人是全科医生
            sf.setSignDoctorCode(sf.getDoctor());

src/main/java/com/yihu/wlyy/service/common/account/DoctorService.java

@@ -90,4 +90,18 @@ public class DoctorService extends TokenService {
			return doctorDao.famousDoctorList(sdf.format(new Date()), pageRequest);
		}
	}
	public Page<Doctor> getDoctorFamousDoctorList(String name, int page, int pagesize) {
		// 分页信息
		Pageable pageRequest = new PageRequest(page-1, pagesize);
		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
		if (StringUtils.isNoneEmpty(name)) {
			name="%"+name+"%";
			return doctorDao.doctorFamousDoctorList(name, pageRequest);
		}else{
			return doctorDao.doctorFamousDoctorList(pageRequest);
		}
	}
}

src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorConsultController.java

@@ -124,15 +124,19 @@ public class DoctorConsultController extends WeixinBaseController {
			int pagesize) {
		try {
			JSONArray array = new JSONArray();
			Page<Doctor>list = doctorService.famousDoctorList(name, page, pagesize);
			Page<Doctor>list = doctorService.getDoctorFamousDoctorList(name, page, pagesize);
			if (list != null) {
				for (Doctor doctor : list) {
					if (doctor == null) {
						continue;
					}
					// 过滤掉自己
					if(doctor.getCode().equals(getUID())){
						continue;
					}
					// 判断名医是否在工作
					JSONObject isWorking = doctorWorkTimeService.isFamousDoctorWorking(doctor.getCode());
					JSONObject isWorking = doctorWorkTimeService.isDoctorWorking(doctor.getCode());
					if(isWorking == null || !isWorking.getString("status").equals("1")){
						continue;
@@ -162,8 +166,6 @@ public class DoctorConsultController extends WeixinBaseController {
					json.put("introduce", doctor.getIntroduce());
					// 专长
					json.put("expertise", doctor.getExpertise());
					// 剩余咨询次数
					json.put("num", doctorWorkTimeService.getDoctorConsultTimesRemain(doctor.getCode()));
					array.put(json);
				}
			}