咨询时查询医生工作时间

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/scheduling/DoctorWorkTimeService.java

@@ -11,6 +11,7 @@ import com.yihu.wlyy.repository.doctor.DoctorWorkWeekDao;
import com.yihu.wlyy.repository.doctor.FamousDoctorTimesRemainDao;
import com.yihu.wlyy.repository.message.MessageNoticeSettingDao;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.service.app.message.MessageService;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.eval.StringValueEval;
import org.json.JSONArray;
@@ -43,6 +44,8 @@ public class DoctorWorkTimeService extends BaseService {
    private FamousDoctorTimesRemainDao timesRemainDao;
    @Autowired
    private MessageNoticeSettingDao messageNoticeSettingDao;
    @Autowired
    private MessageService messageService;
    @Transactional
    public void updateDoctorWorkTime(String doctorCode) {
@@ -744,10 +747,12 @@ public class DoctorWorkTimeService extends BaseService {
        }
        //判断居民签约的全科医生是否关闭了"健康咨询在健管师邀请后参与"设置
        MessageNoticeSetting messageNoticeSetting = messageNoticeSettingDao.findByUserAndType(doctor,"1");
        if (messageNoticeSetting!=null){
        //MessageNoticeSetting messageNoticeSetting = messageNoticeSettingDao.findByUserAndType(doctor,"1");
        com.alibaba.fastjson.JSONObject re = messageService.getMessageNoticSetting(doctor,"1");
        if (re!=null){
            //健管师推荐开启,只判断健管师的时间
            if (messageNoticeSetting.getFamilyTopicSwitch()==1){
            if ("1".equals(re.getString("familyTopicSwitch"))){
                json = doctorWork(doctorHealth,week,calendar);
            }else {//健管师推荐关闭，则两个都要判断
                JSONObject doctorJson = doctorWork(doctor,week,calendar);