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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -127,12 +127,13 @@ public class ConsultTeamService extends ConsultService {
                return findByDoctorTypeSix(uid, id, pagesize, title);
            case 7:
                //7 名医咨询 已结束
                return findByDoctorType6(uid, 1, id, pagesize, title);
                return findByDoctorType6(uid, 0, id, pagesize, title);
            case 8:
                return findByDoctorType8(uid, id, pagesize, title);
            case 9:
                return findByDoctorType9(uid, id, pagesize);
            case 10:
                //查询咨询我的
                return findByDoctorType10(uid, id, pagesize, title);
        }
        return null;

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -1670,7 +1670,7 @@ public class FamilyContractService extends BaseService {
    }
    public Map<String,Object> findNoHealthSignFamilyHealth(String doctor, Integer page, Integer pagesize,String patientName,String patientAddr) {
        Map<String,Object> returnMap=new HashedMap();
        Map<String,Object> returnMap=new HashMap();
        if (pagesize == null || pagesize <= 0) {
            pagesize = 10;
        }