Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/sql记录

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/patient/PatientEndpoint.java

@@ -18,6 +18,7 @@ import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -120,6 +121,10 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "isCapacity", value = "是否返回能力评估，1返回其他值不返回，默认不返回", required = false)
            @RequestParam(value = "isCapacity", required = false) String isCapacity) {
        try{
            String agent = getAgentUID();
            if(StringUtils.isNotBlank(agent)){
                id = agent;
            }
            return success("获取成功",patientService.findPatientById(id,isCapacity));
        }catch (Exception e){
            return failedException2(e);