家庭医生签约

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

@@ -596,6 +596,8 @@ public class FamilyContractService extends BaseService {
        sf.setSignSource("2");//签约来源【1 社区签约 2 移动签约】
        //******************扣费接口**********************/
        sf.setExpensesStatus("0");   //扣费状态 【0未扣费 1已扣费 2已退费】
        sf.setBegin(DateUtil.stringToDate(DateUtil.getSignYear()+"-07-01 00:00:00","yyyy-MM-dd HH:mmm:ss"));
        sf.setEnd(DateUtil.stringToDate(DateUtil.getSignYear()+1+"-06-30 23:59:59","yyyy-MM-dd HH:mmm:ss"));
        SignFamily temp = signFamilyDao.save(sf);
@@ -996,7 +998,7 @@ public class FamilyContractService extends BaseService {
        // 更新签约日期
        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.setEnd(DateUtil.stringToDate(DateUtil.getSignYear()+1+"-06-30 23:59:59","yyyy-MM-dd HH:mmm:ss"));
        sf.setOpenid(patient.getOpenid());
        sf.setPatient(patient.getCode());
@@ -3202,7 +3204,7 @@ public class FamilyContractService extends BaseService {
        sf.setSignYear(DateUtil.getSignYear()+"");
        sf.setIsValid(0);
        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.setEnd(DateUtil.stringToDate(DateUtil.getSignYear()+1+"-06-30 23:59:59","yyyy-MM-dd HH:mmm:ss"));
        //设置转签原因
        if(StringUtils.isNotBlank(reason)){
            sf.setRenewChangeReason(reason);
@@ -3393,8 +3395,8 @@ public class FamilyContractService extends BaseService {
        sf.setSignYear(year+"");
        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+"-06-30 23:59:59","yyyy-MM-dd HH:mmm:ss"));
        if(StringUtils.isNotBlank(reason)){
            sf.setRenewChangeReason(reason);

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statistics/StatisticsService.java

@@ -1849,7 +1849,7 @@ public class StatisticsService extends BaseService {
                    " GROUP BY left(f.apply_date,10)";
            //按月
        } else {
            sql = "SELECT (DATE_FORMAT(f.apply_date,'%v')-DATE_FORMAT('" + DateUtil.getFristDayOfMonth() + "','%v')+1) as weekOfMonth,count(1) as signCount " +
            sql = "SELECT (DATE_FORMAT(f.apply_date,'%v')-DATE_FORMAT('"+startDate+"','%v')+1) as weekOfMonth,count(1) as signCount " +
                    " FROM wlyy_sign_family f " +
                    " where f.apply_date >='" + startDate + " 00:00:00' " +
                    " AND f.apply_date<='" + endDate + " 23:59:59' " +
@@ -1889,8 +1889,9 @@ public class StatisticsService extends BaseService {
                    " FROM " +
                    " wlyy_sign_family_renew_log f " +
                    " WHERE " +
                    " f.apply_date >= '" + startDate + "' " +
                    " AND f.apply_date <= '" + endDate + "' " +
                    " f.apply_date >= '" + startDate + "  00:00:00' " +
                    " AND f.apply_date <= '" + endDate + "  23:59:59' " +
                    " AND f.old_admin_team_id = f.admin_team_id"+
                    " AND f.admin_team_id = " + id +
                    " GROUP BY " +
                    " LEFT (f.apply_date, 10)";
@@ -1902,8 +1903,9 @@ public class StatisticsService extends BaseService {
                    " FROM " +
                    " wlyy_sign_family_renew_log f " +
                    " WHERE " +
                    " f.apply_date >= '" + startDate + "' " +
                    " AND f.apply_date <= '" + endDate + "' " +
                    " f.apply_date >= '" + startDate + "  00:00:00' " +
                    " AND f.apply_date <= '" + endDate + " 23:59:59' " +
                    " AND f.old_admin_team_id = f.admin_team_id"+
                    " AND f.admin_team_id = " + id +
                    " GROUP BY " +
                    " DATE_FORMAT(f.apply_date, '%m %v')";
@@ -4464,7 +4466,7 @@ public class StatisticsService extends BaseService {
                    " GROUP BY dateNo ";
        } else {
            inSql = "SELECT ( " +
                    "  DATE_FORMAT(r.apply_date, '%v') - DATE_FORMAT('2017-06-01', '%v') + 1 " +
                    "  DATE_FORMAT(r.apply_date, '%v') - DATE_FORMAT('"+startDate+"', '%v') + 1 " +
                    " ) AS weekOfMonth,COUNT(1) AS inCount FROM wlyy_sign_family_renew_log r  " +
                    " WHERE r.admin_team_id ='" + teamCode + "'  " +
                    " AND r.apply_date >= '" + startDate + "'  " +
@@ -4472,7 +4474,7 @@ public class StatisticsService extends BaseService {
                    " AND r.old_admin_team_id <> r.admin_team_id " +
                    " GROUP BY weekOfMonth ";
            outSql = "SELECT ( " +
                    "  DATE_FORMAT(r.apply_date, '%v') - DATE_FORMAT('2017-06-01', '%v') + 1 " +
                    "  DATE_FORMAT(r.apply_date, '%v') - DATE_FORMAT('"+startDate+"', '%v') + 1 " +
                    " ) AS weekOfMonth,COUNT(1) AS outCount FROM wlyy_sign_family_renew_log r  " +
                    " WHERE r.old_admin_team_id ='" + teamCode + "'  " +
                    " AND r.apply_date >= '" + startDate + "'  " +

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/account/DoctorController.java

@@ -1626,6 +1626,7 @@ public class DoctorController extends BaseController {
            redisTemplate.expire("jianguanshifenpei:" + getUID(), 10, TimeUnit.MINUTES);
            return write(200, "更新成功");
        } catch (Exception e) {
            error(e);
            redisTemplate.opsForValue().set("jianguanshifenpei:" + getUID(), "0");
            redisTemplate.expire("jianguanshifenpei:" + getUID(), 10, TimeUnit.MINUTES);
            return error(-1, "更新失败");