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

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

@@ -826,8 +826,17 @@ public class FamilyContractService extends BaseService {
            throw new Exception("全科医生不一致！");
        }
        List<SystemDict> systemDicts = systemDictDao.findByDictName("SIGN_YEAR");
        String signYear = systemDicts.get(0).getCode();
//        List<SystemDict> systemDicts = systemDictDao.findByDictName("SIGN_YEAR");
        Calendar cal = Calendar.getInstance();
        int m = cal.get(Calendar.MONTH)+1;
        String signYear = "" ;
        if(m>=4){
            //签约当前年度
            signYear = cal.get(Calendar.YEAR)+"";
        }else{
            //签约过去年度
            signYear = (cal.get(Calendar.YEAR)-1)+"";
        }
        SignFamily sf = new SignFamily();
        sf.setSignYear(signYear);//设置签约年度
@@ -1119,8 +1128,17 @@ public class FamilyContractService extends BaseService {
                }
            }
            List<SystemDict> systemDicts = systemDictDao.findByDictName("SIGN_YEAR");
            String year = systemDicts.get(0).getCode();
            //List<SystemDict> systemDicts = systemDictDao.findByDictName("SIGN_YEAR");
            Calendar cal = Calendar.getInstance();
            int m = cal.get(Calendar.MONTH)+1;
            String year = "" ;
            if(m>=4){
                //签约当前年度
                year = cal.get(Calendar.YEAR)+"";
            }else{
                //签约过去年度
                year = (cal.get(Calendar.YEAR)-1)+"";
            }
            Calendar now = Calendar.getInstance();
            int month = now.get(Calendar.MONTH) + 1;