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

src/main/java/com/yihu/wlyy/entity/patient/SignFamily.java

@@ -60,7 +60,7 @@ public class SignFamily extends IdEntity {
	private String agentDoctorCode;//代理簽約人code
	private String agentDoctorName;//代理簽約人銘
	private String agentDoctorLevel;//代理簽約人等级
	private String adminTeamCode;//行政团队code
	private Long adminTeamCode;//行政团队code
	public String getCode() {
		return code;
@@ -418,11 +418,11 @@ public class SignFamily extends IdEntity {
	}
	@Column(name = "admin_team_code")
	public String getAdminTeamCode() {
	public Long getAdminTeamCode() {
		return adminTeamCode;
	}
	public void setAdminTeamCode(String adminTeamCode) {
	public void setAdminTeamCode(Long adminTeamCode) {
		this.adminTeamCode = adminTeamCode;
	}

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

@@ -369,7 +369,7 @@ public class FamilyContractService extends BaseService {
        sf.setPatientApplyDate(new Date());
        sf.setDoctor(doctor);
        //设置全科医生的行政团队
        sf.setAdminTeamCode(doctorAdminTeamDao.findIdByLeaderCode(doctor)+"");
        sf.setAdminTeamCode(doctorAdminTeamDao.findIdByLeaderCode(doctor));
        sf.setMobile(mobile);
        sf.setDoctorName(d.getName());
        sf.setEmerMobile(emerMobile);
@@ -654,7 +654,7 @@ public class FamilyContractService extends BaseService {
        sf.setCzrq(new Date());
        //设置全科医生的行政团队
        sf.setAdminTeamCode(doctorAdminTeamDao.findIdByLeaderCode(doctor)+"");
        sf.setAdminTeamCode(doctorAdminTeamDao.findIdByLeaderCode(doctor));
        sf.setDoctor(doctor);
        sf.setDoctorName(doctorName);
        sf.setDoctorHealth(doctorHealth);