云照护修改

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/sign/ServicePackageService.java

@@ -267,19 +267,20 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
                ",p.`name`,p.sex,p.mobile,p.idcard,p.birthday,p.openid,p.photo ";
        String countSql = "select count(distinct p.id) ";
        String filter = " from base_patient p  " +
                " inner JOIN base_service_package_sign_record r on p.id = r.patient and r.status=1 " +
                " inner JOIN base_service_package_sign_record r on p.id = r.patient and r.status=1" +
                " LEFT JOIN base_service_package_record pr on pr.sign_id = r.id " +
                " LEFT JOIN base_capacity_assessment_record ar on ar.patient = p.id and ar.assessment_time>= '" + DateUtil.getNowYear() + "-01-01' " +
                " LEFT JOIN wlyy_hospital_sys_dict di2 on di2.dict_name = 'level_conclusion' and di2.dict_code=ar.level_conclusion " +
                " where 1=1 ";
        if(StringUtils.isNotBlank(doctorId)){
            filter += " and r.check_doctor = '"+doctorId+"' ";
            filter += " and (r.check_doctor = '"+doctorId+"' or (pr.doctor='"+doctorId+"' and pr.type='2'))";
        }
        if(StringUtils.isNotBlank(name)){
            filter += " and p.name like '%"+name+"%' ";
        }
        String oderBy = " order by r.id desc limit "+(page-1)*size+","+size;
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql+filter+oderBy);
        String packageSql = "SELECT r.id,DATE_FORMAT(r.end_time,'%Y-%m-%d %H:%i:%S') endTime,r.type,p.`name`,p.num,p.org_name orgName " +
        String packageSql = "SELECT r.id,r.service_package_id servicePackageId,DATE_FORMAT(r.end_time,'%Y-%m-%d %H:%i:%S') endTime,r.type,p.`name`,p.num,p.org_name orgName " +
                "from base_service_package_sign_record r,base_service_package p " +
                "WHERE r.patient =? and r.`status`=1 and r.service_package_id=p.id ";
        for (Map<String,Object> map:list){
@@ -331,7 +332,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
            //判断是否支付过期
            String overTime = DateUtil.getNextMinute(DateUtil.dateToStrLong(signRecordDO.getUpdateTime()),Integer.parseInt(signRecordDO.getPayTime()));
            long over = DateUtil.compareDate(DateUtil.YYYY_MM_DD_HH_MM_SS,DateUtil.getStringDate(),overTime);
            if(over<=0){
            if(over>=0){
                signRecordDO.setStatus(-2);
                signRecordDO.setLostReason("超时未支付，系统自动关闭申请");
                servicePackageSignRecordDao.save(signRecordDO);
@@ -362,7 +363,8 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
        int signNum = 0;//已签约
        int expiredNum = 0;//已到期
        String sql = "SELECT COUNT(sr.id) num,status  from base_service_package_sign_record sr " +
                "WHERE sr.check_doctor = '"+doctorId+"' group by status";
                "LEFT JOIN base_service_package_record r on r.sign_id = sr.id " +
                "WHERE (sr.check_doctor = '"+doctorId+"' or (r.doctor='"+doctorId+"' and r.type='2')) group by status";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        for (Map<String,Object> map :list){
            String status = map.get("status")+"";
@@ -406,7 +408,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
        String filter = " from base_service_package_sign_record r " +
                " inner JOIN base_patient p on p.id = r.patient " +
                " LEFT JOIN base_service_package sp on r.service_package_id=sp.id " +
                " LEFT JOIN base_service_package_record pr on pr.sign_id = sr.id" +
                " LEFT JOIN base_service_package_record pr on pr.sign_id = r.id" +
                " LEFT JOIN wlyy_hospital_sys_dict di on di.dict_name = 'sign_status' and di.dict_code=r.status " +
                " LEFT JOIN base_capacity_assessment_record ar on ar.patient = r.patient and ar.assessment_time>= '" + DateUtil.getNowYear() + "-01-01' " +
                " LEFT JOIN wlyy_hospital_sys_dict di2 on di2.dict_name = 'level_conclusion' and di2.dict_code=ar.level_conclusion " +
@@ -437,7 +439,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
                //判断是否支付过期
                String overTime = DateUtil.getNextMinute(updateTime,Integer.parseInt(payTime));
                long over = DateUtil.compareDate(DateUtil.YYYY_MM_DD_HH_MM_SS,DateUtil.getStringDate(),overTime);
                if(over<=0){
                if(over>=0){
                    jdbcTemplate.execute("UPDATE base_service_package_sign_record set `status`=-2,lost_reason='超时未支付，系统自动关闭申请' where id='"+id+"'");
                    map.put("status","-2");
                    map.put("lostReason","超时未支付，系统自动关闭申请");