云照护修改

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

@@ -301,14 +301,16 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
     */
    public int doctorSignTotal(String doctorId){
        String sql = "SELECT COUNT(distinct sr.patient) from base_service_package_sign_record sr " +
                "WHERE sr.status=1 and sr.check_doctor = '"+doctorId+"' ";
                "LEFT JOIN base_service_package_record r on r.sign_id = sr.id " +
                "WHERE sr.status=1 and (sr.check_doctor = '"+doctorId+"' or (r.doctor='"+doctorId+"' and r.type='2'))";
        return jdbcTemplate.queryForObject(sql,Integer.class);
    }
    //签约服务包数
    public int doctorSignServerPackageTotal(String doctorId){
        String sql = "SELECT COUNT(sr.service_package_id) from base_service_package_sign_record sr " +
                "WHERE sr.status=1 and sr.check_doctor = '"+doctorId+"' ";
        String sql = "SELECT COUNT(distinct sr.service_package_id) from base_service_package_sign_record sr " +
                "LEFT JOIN base_service_package_record r on r.sign_id = sr.id " +
                "WHERE sr.status=1 and (sr.check_doctor = '"+doctorId+"' or (r.doctor='"+doctorId+"' and r.type='2'))";
        return jdbcTemplate.queryForObject(sql,Integer.class);
    }
@@ -404,6 +406,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 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 " +
@@ -412,7 +415,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
            filter += " and r.patient = '"+patientId+"' ";
        }
        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(status)){
            filter += " and r.status = "+status+" ";