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

common/common-entity/src/main/java/com/yihu/es/entity/MapDataDTO.java

@@ -6,7 +6,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import io.searchbox.annotations.JestId;
import org.springframework.data.elasticsearch.annotations.GeoPointField;
import org.springframework.data.elasticsearch.core.geo.GeoPoint;
import java.util.Date;
*/

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

@@ -746,8 +746,10 @@ public class DoctorWorkTimeService extends BaseService {
        //判断居民签约的全科医生是否关闭了"健康咨询在健管师邀请后参与"设置
        MessageNoticeSetting messageNoticeSetting = messageNoticeSettingDao.findByUserAndType(doctor,"1");
        if (messageNoticeSetting!=null){
            //健管师推荐开启
            //健管师推荐开启,只判断健管师的时间
            if (messageNoticeSetting.getFamilyTopicSwitch()==1){
                json = doctorWork(doctorHealth,week,calendar);
            }else {//健管师推荐关闭，则两个都要判断
                JSONObject doctorJson = doctorWork(doctor,week,calendar);
                JSONObject doctorHealthJson = doctorWork(doctorHealth,week,calendar);
                String doctorStatus = doctorJson.getString("status");
@@ -777,8 +779,6 @@ public class DoctorWorkTimeService extends BaseService {
                    json.put("status","4");
                    json.put("msg","健管师当前不在工作时间");
                }
            }else {//健管师推荐关闭
                json = doctorWork(doctorHealth,week,calendar);
            }
        }
        return json;