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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/label/SignPatientLabelInfoService.java

@@ -21,6 +21,7 @@ import com.yihu.wlyy.service.app.account.PatientInfoService;
import com.yihu.wlyy.service.app.health.PatientHealthIndexService;
import com.yihu.wlyy.service.app.team.AdminTeamService;
import com.yihu.wlyy.service.specialist.SpecialistService;
import com.yihu.wlyy.service.specialist.rehabilitation.RehabilitationManageService;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.IdCardUtil;
import org.apache.commons.collections.map.HashedMap;
@@ -84,6 +85,8 @@ public class SignPatientLabelInfoService extends BaseService {
    PatientHealthIndexService patientHealthIndexService;
    @Autowired
    SpecialistService specialistService;
    @Autowired
    RehabilitationManageService rehabilitationManageService;
    private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -273,7 +276,13 @@ public class SignPatientLabelInfoService extends BaseService {
        }else{
            json.put("isSpecialist",0);
        }
        //1.5.0 是否有康复计划
        JSONArray planList = rehabilitationManageService.planListByPatient(patient);
        if(planList!=null&&planList.length()>0){
            json.put("havePlan",1);
        }else{
            json.put("havePlan",0);
        }
        return json;
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/specialist/rehabilitation/RehabilitationManageService.java

@@ -79,6 +79,7 @@ public class RehabilitationManageService extends BaseService {
    private String updateNoteAndImageRehabilitationOperate ="/svr-specialist/updateNoteAndImageRehabilitationOperate";//康复计划完成时更新服务完成笔记和图片接口;
    private String updatePlanDetailStatusById = "/svr-specialist/updatePlanDetailStatusById";//康复管理-更新康复计划服务项目状态
    private String planSchedule = "/svr-specialist/planSchedule";//康复管理-计划总进度
    private String planListByPatient = "/svr-specialist/planListByPatient";//康复管理-根据居民获取康复计划
    /************************************************************* end ************************************************************************/
    /**
@@ -634,4 +635,17 @@ public class RehabilitationManageService extends BaseService {
        }
        throw new Exception("请求微服务失败！");
    }
    public JSONArray planListByPatient(String patient) throws Exception {
        Map<String, Object> param = new HashedMap();
        param.put("patient", patient);
        HttpResponse response = HttpUtils.doGet(specialistUrl + planListByPatient, param);
        if(StringUtils.isNotBlank(response.getContent())) {
            JSONObject result = new JSONObject(response.getContent());
            if(result.getInt("status")==200){
                return result.getJSONArray("obj");
            }
        }
        throw new Exception("请求微服务失败！");
    }
}