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

Conflicts:
	svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/sign/CapacityAssessmentRecordService.java

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/family/PatientFamilyMemberService.java

@@ -307,7 +307,7 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
    /**
     * 获取居民的家庭成员
     *
     * isContain 1包含自己
     * @param patient 居民
     * @return
     */