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

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

@@ -845,7 +845,7 @@ public class FamilyContractService extends BaseService {
        }
        SignFamily sf = new SignFamily();
        sf.setSignYear(signYear);//设置签约年度
        sf.setSignYear(DateUtil.getSignYear()+"");//设置签约年度
        sf.setBegin(DateUtil.getNowDateShort());
        sf.setCode(getCode());
        sf.setCzrq(new Date());
@@ -926,32 +926,32 @@ public class FamilyContractService extends BaseService {
        Calendar begin = Calendar.getInstance();
        Calendar end = Calendar.getInstance();
        // 起始时间
        begin.set(Calendar.HOUR, 0);
        begin.set(Calendar.MINUTE, 0);
        end.set(Calendar.SECOND, 0);
        begin.set(Calendar.MILLISECOND, 0);
        // 结束时间
        end.set(Calendar.HOUR, 0);
        end.set(Calendar.MINUTE, 0);
        end.set(Calendar.SECOND, 0);
        end.set(Calendar.MILLISECOND, 0);
        end.set(Calendar.MONTH, 5);
        end.set(Calendar.DATE, 30);
        if (month < 2 || month > 5) {
            if (month > 5) {
                end.add(Calendar.YEAR, 1);
            }
        } else {
            begin.set(Calendar.MONTH, 6);
            begin.set(Calendar.DATE, 1);
            end.add(Calendar.YEAR, 1);
        }
//        begin.set(Calendar.HOUR, 0);
//        begin.set(Calendar.MINUTE, 0);
//        end.set(Calendar.SECOND, 0);
//        begin.set(Calendar.MILLISECOND, 0);
//
//        // 结束时间
//        end.set(Calendar.HOUR, 0);
//        end.set(Calendar.MINUTE, 0);
//        end.set(Calendar.SECOND, 0);
//        end.set(Calendar.MILLISECOND, 0);
//        end.set(Calendar.MONTH, 5);
//        end.set(Calendar.DATE, 30);
//
//        if (month < 2 || month > 5) {
//            if (month > 5) {
//                end.add(Calendar.YEAR, 1);
//            }
//        } else {
//            begin.set(Calendar.MONTH, 6);
//            begin.set(Calendar.DATE, 1);
//            end.add(Calendar.YEAR, 1);
//        }
        // 更新签约日期
        sf.setBegin(begin.getTime());
        sf.setEnd(end.getTime());
        sf.setBegin(DateUtil.stringToDate(DateUtil.getSignYear()+"-07-01 00:00:00","yyyy-MM-dd HH:mmm:ss"));
        sf.setEnd(DateUtil.stringToDate(DateUtil.getSignYear()+1+"-07-01 00:00:00","yyyy-MM-dd HH:mmm:ss"));
        sf.setOpenid(patient.getOpenid());
        sf.setPatient(patient.getCode());
@@ -1187,8 +1187,8 @@ public class FamilyContractService extends BaseService {
            }
            // 更新签约日期
            sf.setBegin(begin.getTime());
            sf.setEnd(end.getTime());
            sf.setBegin(DateUtil.stringToDate(DateUtil.getSignYear()+"-07-01 00:00:00","yyyy-MM-dd HH:mmm:ss"));
            sf.setEnd(DateUtil.stringToDate(DateUtil.getSignYear()+1+"-07-01 00:00:00","yyyy-MM-dd HH:mmm:ss"));
            // 改为签约生效
@@ -1221,7 +1221,7 @@ public class FamilyContractService extends BaseService {
            sf.setSignDoctorLevel(String.valueOf(docLeader.getLevel()));
            sf.setCzrq(new Date());
            sf.setSignYear(year);//设置签约年度
            sf.setSignYear(DateUtil.getSignYear()+"");//设置签约年度
            sf.setApplyDate(new Date());
            Doctor doc = doctorDao.findByCode(sf.getDoctor());
            //sf.setFamilyCode(createSignCode(sf.getDoctor(), doc.getHospital()));
@@ -3083,10 +3083,10 @@ public class FamilyContractService extends BaseService {
        //******************扣费接口**********************/
        sf.setExpensesStatus("0");   //扣费状态 【0未扣费 1已扣费 2已退费】
        sf.setSignYear(year+"");
        sf.setSignYear(DateUtil.getSignYear()+"");
        sf.setIsValid(0);
        sf.setBegin(new Date());
        sf.setEnd(DateUtil.stringToDate(year+1+"-06-30 00:00:00","yyyy-MM-dd HH:mmm:ss"));
        sf.setBegin(DateUtil.stringToDate(DateUtil.getSignYear()+"-07-01 00:00:00","yyyy-MM-dd HH:mmm:ss"));
        sf.setEnd(DateUtil.stringToDate(DateUtil.getSignYear()+1+"-07-01 00:00:00","yyyy-MM-dd HH:mmm:ss"));
        SignFamilyRenew temp = signFamilyRenewDao.save(sf);
        if (temp != null) {