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

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

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

src/main/java/com/yihu/wlyy/repository/doctor/DoctorAdminTeamDao.java

@@ -39,4 +39,7 @@ public interface DoctorAdminTeamDao extends
            "WHERE d1.code = f.doctor AND f.doctorHealth = d2.code AND f.patient = :patientCode AND m.doctorCode = " +
            "d1.code AND m.teamId = t.id")
    Object getPatientSigningTeam(@Param("patientCode") String patientCode);
    @Query("SELECT t.id from AdminTeam t WHERE t.leaderCode = :leaderCode")
    Long findIdByLeaderCode(@Param("leaderCode") String leaderCode);
}

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

@@ -93,6 +93,9 @@ public class FamilyContractService extends BaseService {
    @Autowired
    private SocialSecurityInfoDao socialSecurityInfoDao;
    @Autowired
    private DoctorAdminTeamDao doctorAdminTeamDao;
    public SignFamily findByPatientByType(String patient, int type) {
        return signFamilyDao.findByPatientAndType(patient, type);
    }
@@ -365,6 +368,8 @@ public class FamilyContractService extends BaseService {
        sf.setCzrq(new Date());
        sf.setPatientApplyDate(new Date());
        sf.setDoctor(doctor);
        //设置全科医生的行政团队
        sf.setAdminTeamCode(doctorAdminTeamDao.findIdByLeaderCode(doctor)+"");
        sf.setMobile(mobile);
        sf.setDoctorName(d.getName());
        sf.setEmerMobile(emerMobile);
@@ -647,6 +652,9 @@ public class FamilyContractService extends BaseService {
        sf.setBegin(DateUtil.getNowDateShort());
        sf.setCode(getCode());
        sf.setCzrq(new Date());
        //设置全科医生的行政团队
        sf.setAdminTeamCode(doctorAdminTeamDao.findIdByLeaderCode(doctor)+"");
        sf.setDoctor(doctor);
        sf.setDoctorName(doctorName);
        sf.setDoctorHealth(doctorHealth);