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

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

@@ -659,7 +659,7 @@ public class ConsultTeamService extends ConsultService {
            if (doctorTeamMember == null) {
                doctorTeamMember = doctorTeamDoctor.findDoctorJiating2ByTeam(doctorTeam.getCode(), 2);
            }
            ct.setTeam(sf.getTeamCode());
            // 设置家庭医生
            ct.setDoctor(doctorTeamMember.getMemberCode());
            ct.setAdminTeamId(sf.getAdminTeamId());

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

@@ -176,6 +176,8 @@ public class SignWebService extends BaseService {
            } else if(!set.containsAll(result)) {
                isAll = false;
            }
        } else {
            isAll = false;
        }
        return isAll ? 1 : 0;
@@ -208,6 +210,8 @@ public class SignWebService extends BaseService {
            } else if(!set.containsAll(result)) {
                isAll = false;
            }
        } else {
            isAll = false;
        }
        return isAll ? 1 : 0;