Browse Source

影像采集情况接口

chenyongxing 6 years ago
parent
commit
ea2cfa2d0f

+ 5 - 6
src/main/java/com/yihu/ehr/analyze/service/pack/PackQcReportService.java

@ -912,10 +912,9 @@ public class PackQcReportService extends BaseJpaService {
            sqlSb.append(" group by org_code");
            fields.add("org_code");
        }
//        sqlSb.append(" order by count desc");
        sqlSb.append(" order by count desc");
        fields.add("count");
        List<Map<String, Object>> resultList = elasticSearchUtil.findBySql(fields, sqlSb.toString());
        System.out.println(resultList.size()+"-----------------------------");
        if (resultList != null && resultList.size() > 0) {
            for (Map<String,Object> map : resultList){
                Map info = new HashMap();
@ -929,9 +928,9 @@ public class PackQcReportService extends BaseJpaService {
                    //查找该地区入库量
                    String sql = "";
                    if(StringUtils.isBlank(startDate)){
                        sql = "select count(*) from json_archives where org_area ='"+org_area+"' and archive_staus=3 and pack_type=3 and receive_date<='"+endDate+" 23:59:59' group by profile_id";
                        sql = "select count(*) from json_archives where org_area ='"+org_area+"' and archive_status=3 and pack_type=3 and receive_date<='"+endDate+" 23:59:59' group by profile_id";
                    }else{
                        sql = "select count(*) from json_archives where org_area ='"+org_area+"' and archive_staus=3 and pack_type=3 and receive_date<='"+endDate+" 23:59:59' and receive_date>='"+startDate+"' group by profile_id";
                        sql = "select count(*) from json_archives where org_area ='"+org_area+"' and archive_status=3 and pack_type=3 and receive_date<='"+endDate+" 23:59:59' and receive_date>='"+startDate+"' group by profile_id";
                    }
                    ResultSet resultSet = elasticSearchUtil.findBySql(sql);
                    resultSet.next();
@ -946,9 +945,9 @@ public class PackQcReportService extends BaseJpaService {
                    //查找该机构入库量
                    String sql = "";
                    if(StringUtils.isBlank(startDate)){
                        sql = "select count(*) from json_archives where org_code ='"+org_code+"' and archive_staus=3 and pack_type=3 and receive_date<='"+endDate+" 23:59:59' group by profile_id";
                        sql = "select count(*) from json_archives where org_code ='"+org_code+"' and archive_status=3 and pack_type=3 and receive_date<='"+endDate+" 23:59:59' group by profile_id";
                    }else{
                        sql = "select count(*) from json_archives where org_code ='"+org_code+"' and archive_staus=3 and pack_type=3 and receive_date<='"+endDate+" 23:59:59' and receive_date>='"+startDate+" 00:00:00' group by profile_id";
                        sql = "select count(*) from json_archives where org_code ='"+org_code+"' and archive_status=3 and pack_type=3 and receive_date<='"+endDate+" 23:59:59' and receive_date>='"+startDate+" 00:00:00' group by profile_id";
                    }
                    ResultSet resultSet = elasticSearchUtil.findBySql(sql);
                    resultSet.next();