Merge branch 'dev' of chenweida/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultService.java

@@ -96,4 +96,7 @@ public class ConsultService extends BaseService {
		}
	}
	public Consult findOneConsult(String consult) {
		return consultDao.findByCode(consult);
	}
}

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

@@ -3,6 +3,8 @@ package com.yihu.wlyy.web.doctor.consult;
import java.util.List;
import java.util.Map;
import com.yihu.wlyy.entity.consult.Consult;
import com.yihu.wlyy.service.app.consult.ConsultService;
import com.yihu.wlyy.service.app.health.PatientHealthGuidanceService;
import com.yihu.wlyy.service.app.scheduling.DoctorWorkTimeService;
import com.yihu.wlyy.service.common.account.DoctorService;
@@ -54,6 +56,8 @@ public class DoctorConsultController extends WeixinBaseController {
    private DoctorService doctorService;
    @Autowired
    private DoctorWorkTimeService doctorWorkTimeService;
    @Autowired
    private ConsultService consultService;
    /**
     * 三师咨询列表查询
@@ -187,6 +191,9 @@ public class DoctorConsultController extends WeixinBaseController {
                json.put("doctorRead", consult.getDoctorRead());
                // 设置关联指导
                json.put("guidance", consult.getGuidance());
                Consult consultObj=consultService.findOneConsult(consult.getConsult());
                json.put("startId", consultObj.getStartMsgId());
                json.put("endId", consultObj.getEndMsgId());
                jsonArray.put(json);
            }