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

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

@@ -1014,6 +1014,16 @@ public class FamilyContractService extends BaseService {
        doctorTeam.setDel("1");
        doctorTeamDao.save(doctorTeam);
        sf.setTeamCode(doctorTeamCode);
        ///1.3.5判断是否续签
        if(checkLastYearIsSign(sf.getPatient(),sf.getDoctor())){
            //如果为续签
            signWebService.setRenewLog(sf);
            sf.setRenewFlag("1");
        }else{
            sf.setRenewFlag("0");
        }
        signFamilyDao.save(sf);
        //添加团队成员
        //添加健康管理师
@@ -3807,4 +3817,20 @@ public class FamilyContractService extends BaseService {
    }
    /**
     * 判断患者和医生是否有去年的签约记录
     * @param patient
     * @param doctor
     * @return
     */
    public boolean checkLastYearIsSign(String patient,String doctor){
        String sql = "SELECT f.id FROM wlyy_sign_family f WHERE f.doctor ='"+doctor+"' AND f.patient='"+patient+"' AND f.sign_year='"+(DateUtil.getSignYear()-1)+"' AND f.`status`=-4 AND f.expenses_status ='1'";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        if (list!=null&&list.size()>0){
            return true;
        }else{
            return false;
        }
    }
}