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

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

@@ -882,8 +882,8 @@ public class FamilyContractService extends BaseService {
        end.set(Calendar.MONTH, 5);
        end.set(Calendar.DATE,30);
        if (month < 3 || month > 6) {
            if (month > 6) {
        if (month < 2 || month > 5) {
            if (month > 5) {
                end.add(Calendar.YEAR, 1);
            }
        } else {
@@ -1070,8 +1070,8 @@ public class FamilyContractService extends BaseService {
            end.set(Calendar.MONTH, 5);
            end.set(Calendar.DATE,30);
            if (month < 3 || month > 6) {
                if (month > 6) {
            if (month < 2 || month > 5) {
                if (month > 5) {
                    end.add(Calendar.YEAR, 1);
                }
            } else {