云照护修改

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

@@ -287,7 +287,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
            List<Map<String,Object>> packageList = jdbcTemplate.queryForList(packageSql,new Object[]{id});
            map.put("packageList",packageList);
        }
        long count = jdbcTemplate.queryForObject(countSql+filter+oderBy,Long.class);
        long count = jdbcTemplate.queryForObject(countSql+filter,Long.class);
        return PageEnvelop.getSuccessListWithPage("查询成功",list,page,size,count);
    }
@@ -381,7 +381,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
     */
    public PageEnvelop signPage(String patientId,String doctorId,String name,String status,Integer page,Integer size){
        String sql = "SELECT DISTINCT ar.level_conclusion,di2.dict_value levelConclusionName,r.id,r.`status`,di.dict_value statusName" +
                ",r.patient,p.`name`,p.sex,p.mobile,p.idcard,p.birthday,p.openid " +
                ",r.patient,p.`name`,p.sex,p.mobile,p.idcard,p.birthday,p.openid,r.service_package_id servicePackageId " +
                ",p.photo,DATE_FORMAT(r.create_time,'%Y-%m-%d %H:%i:%S') createTime,r.type,sp.`name` packageName,sp.num,sp.org_name orgName";
        String countSql = "select count(distinct r.id) ";
        String filter = " from base_service_package_sign_record r " +
@@ -410,7 +410,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
            String birthday = map.get("birthday")+"";
            map.put("age", IdCardUtil.getAgeByBirthdayStrOrIdcard(idcard,birthday));
        }
        long count = jdbcTemplate.queryForObject(countSql+filter+oderBy,Long.class);
        long count = jdbcTemplate.queryForObject(countSql+filter,Long.class);
        return PageEnvelop.getSuccessListWithPage("查询成功",list,page,size,count);
    }