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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/weixin/applets/AppletsService.java

@@ -117,7 +117,7 @@ public class AppletsService extends BaseService {
        return list.get(0);
    }
    public Boolean setPatientStep(String patient,Integer step){
    public Boolean setPatientStep(String patient,Integer step) throws Exception{
        String sql = "SELECT " +
                " s.id, " +
                " s.patientcode " +
@@ -142,14 +142,11 @@ public class AppletsService extends BaseService {
        }
        //上传步数记录
        try{
            com.alibaba.fastjson.JSONObject json  = new com.alibaba.fastjson.JSONObject();
            json.put("patientId",patient);
            json.put("taskCode","ACTIVITY_STEP");
            taskService.createActiveRecord(json);
        }catch (Exception e){
            logger.info(e.toString());
        }
        com.alibaba.fastjson.JSONObject json  = new com.alibaba.fastjson.JSONObject();
        json.put("patientId",patient);
        json.put("taskCode","ACTIVITY_STEP");
        taskService.createActiveRecord(json);
        return true;
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/BaseController.java

@@ -107,8 +107,12 @@ public class BaseController {
                userAgent = request.getHeader("User-Agent");
            }
            JSONObject json = new JSONObject(userAgent);
            return json.getString("lastUid");
            String id = json.getString("lastUid");
            if(StringUtils.isNoneBlank(id)){
                return id;
            }else{
               return json.getString("uid");
            }
        } catch (Exception e) {
            return null;
        }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/family/FamilyMemberController.java

@@ -235,7 +235,7 @@ public class FamilyMemberController extends WeixinBaseController {
    @ApiOperation(value = "家庭成员(有授权)查询")
    public String getAuthorizeFamilyMembers(){
        try {
            JSONArray result = familyMemberService.getAuthorizeMembers(getUID());
            JSONArray result = familyMemberService.getAuthorizeMembers(getLastUid());
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {