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

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

@@ -4015,17 +4015,20 @@ public class FamilyContractService extends BaseService {
        maping.setIdcard(idCard);
        maping.setNeedUpdate("0");
        maping.setSignYear(signYear);
        maping.setNeedUpload("1");
        maping.setNeedRenewUpload("0");
        //判断是否是预签约
        //判断规则:如果在4月份到7月份为预签约
        int month = DateUtil.getNowMonth();
        if (month >= 4 && month < 7) {
            //预签约逻辑
            maping.setNeedUpload("0");
            maping.setNeedRenewUpload("1");
        } else {
            maping.setNeedUpload("1");
            maping.setNeedRenewUpload("0");
        }
//        int month = DateUtil.getNowMonth();
//        if (month >= 4 && month < 7) {
//            //预签约逻辑
//            maping.setNeedUpload("0");
//            maping.setNeedRenewUpload("1");
//        } else {
//            maping.setNeedUpload("1");
//            maping.setNeedRenewUpload("0");
//        }
        signFamilyMappingDao.save(maping);
    }