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

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

@@ -879,7 +879,7 @@ public class FamilyContractService extends BaseService {
        end.set(Calendar.MINUTE,0);
        end.set(Calendar.SECOND,0);
        end.set(Calendar.MILLISECOND,0);
        end.set(Calendar.MONTH, 6);
        end.set(Calendar.MONTH, 5);
        end.set(Calendar.DATE,30);
        if (month < 3 || month > 6) {
@@ -887,7 +887,7 @@ public class FamilyContractService extends BaseService {
                end.add(Calendar.YEAR, 1);
            }
        } else {
            begin.set(Calendar.MONTH, 7);
            begin.set(Calendar.MONTH, 6);
            begin.set(Calendar.DATE,1);
            end.add(Calendar.YEAR, 1);
        }
@@ -1067,7 +1067,7 @@ public class FamilyContractService extends BaseService {
            end.set(Calendar.MINUTE,0);
            end.set(Calendar.SECOND,0);
            end.set(Calendar.MILLISECOND,0);
            end.set(Calendar.MONTH, 6);
            end.set(Calendar.MONTH, 5);
            end.set(Calendar.DATE,30);
            if (month < 3 || month > 6) {
@@ -1075,7 +1075,7 @@ public class FamilyContractService extends BaseService {
                    end.add(Calendar.YEAR, 1);
                }
            } else {
                begin.set(Calendar.MONTH, 7);
                begin.set(Calendar.MONTH, 6);
                begin.set(Calendar.DATE,1);
                end.add(Calendar.YEAR, 1);
            }