feat:家庭医生初始化

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/DoctorServiceImpl.java

@@ -17,7 +17,6 @@ import com.ebaiyihui.family.doctor.server.service.ServiceConfigService;
 import com.ebaiyihui.framework.page.PageResult;
 import com.ebaiyihui.framework.response.BaseResponse;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -95,7 +94,7 @@ public class DoctorServiceImpl implements DoctorService {
             doctorListVo.setOrganId(Integer.valueOf(wOrganId));
             doctorListVo.setDeptId(dto.getDeptId().intValue());
             doctorListVo.setPhoneNum(dto.getTelephone());
-            doctorListVo.setLastSign(new Integer("0"));
+            doctorListVo.setLastSign(0);
 
             //上下线
 //            getDoctorOfficeStatusAndDoctorLabel(reqVo, dto.getDeptId(), dto.getOrganId(), doctorId, doctorListVo);
@@ -111,11 +110,12 @@ public class DoctorServiceImpl implements DoctorService {
 //                continue;
 //            }
             //处理 有搜索参数时，并且是上次选择 的医生
-            if (null != entity && entity.getDoctorId().equals(dto.getXId().toString())) {
+            if (null != entity && String.valueOf(entity.getDoctorId()).equals(dto.getXId().toString())) {
 //                if (StringUtils.isNotEmpty(reqVo.getSearchParam()) || null != (reqVo.getOrganDeptId())) {
-                    doctorListVo.setLastSign(new Integer("1"));
-                    doctorListVos.add(0, doctorListVo);
-                    continue;
+                log.info("进入上次选择医生信息");
+                doctorListVo.setLastSign(1);
+                doctorListVos.add(0, doctorListVo);
+                continue;
 //                }
             }