move

src/main/java/com/yihu/ehr/analyze/controller/PackStatisticsEndPoint.java

@@ -147,7 +147,9 @@ public class PackStatisticsEndPoint extends EnvelopRestEndPoint {
            @ApiParam(name = "startDate", value = "开始日期")
            @RequestParam(name = "startDate") String startDate,
            @ApiParam(name = "endDate", value = "结束日期")
            @RequestParam(name = "endDate") String endDate) throws Exception {
        return statisticService.getReceiveNum(startDate, endDate);
            @RequestParam(name = "endDate") String endDate,
            @ApiParam(name = "orgArea", value = "区域代码")
            @RequestParam(name = "orgArea", required = false) String orgArea) throws Exception {
        return statisticService.getReceiveNum(startDate, endDate, orgArea);
    }
}

src/main/java/com/yihu/ehr/analyze/controller/dataQuality/DataQualityHomeEndpoint.java

@@ -99,7 +99,7 @@ public class DataQualityHomeEndpoint extends EnvelopRestEndPoint {
            @RequestParam(value = "orgArea", required = false) String orgArea,
            @ApiParam(name = "orgCode", value = "机构代码")
            @RequestParam(value = "orgCode", required = false) String orgCode,
            @ApiParam(name = "dataType", value = "数据维度  （0: 完整性，1:准确性）")
            @ApiParam(name = "dataType", value = "数据维度  （0: 完整性，2:准确性）")
            @RequestParam(value = "dataType", required = false) Integer dataType,
            @ApiParam(name = "start", value = "开始时间，（接收时间）")
            @RequestParam(value = "start", required = false) String start,
@@ -125,7 +125,7 @@ public class DataQualityHomeEndpoint extends EnvelopRestEndPoint {
            @RequestParam(value = "orgCode", required = false) String orgCode,
            @ApiParam(name = "dataset", value = "数据集")
            @RequestParam(value = "dataset", required = false) String dataset,
            @ApiParam(name = "dataType", value = "数据维度  （0: 完整性，1:准确性）")
            @ApiParam(name = "dataType", value = "数据维度  （0: 完整性，2:准确性）")
            @RequestParam(value = "dataType", required = false) Integer dataType,
            @ApiParam(name = "start", value = "开始时间，（接收时间）")
            @RequestParam(value = "start", required = false) String start,
@@ -150,7 +150,7 @@ public class DataQualityHomeEndpoint extends EnvelopRestEndPoint {
    @RequestMapping(value = "bulkUpDateOrgArea", method = RequestMethod.GET)
    @ApiOperation(value = "批量更新机构关联的区域编码(通过org_code字段更新org_area字段")
    public String bulkUploadOrgArea(
    public long bulkUploadOrgArea(
            @ApiParam(name = "index", value = "索引")
            @RequestParam(value = "index", required = true) String index,
            @ApiParam(name = "type", value = "type")
@@ -159,7 +159,7 @@ public class DataQualityHomeEndpoint extends EnvelopRestEndPoint {
            @RequestParam(value = "filters", required = false) String filters
    ) throws Exception {
        long result = dataQualityHomeService.bulkUpdateOrgArea(index, type, filters);
        return "本次更新总数："+result;
        return result;
    }
}

src/main/java/com/yihu/ehr/analyze/controller/dataQuality/TestDemo.java

@@ -0,0 +1,233 @@
package com.yihu.ehr.analyze.controller.dataQuality;
import com.yihu.ehr.elasticsearch.ElasticSearchPool;
import com.yihu.ehr.elasticsearch.ElasticSearchUtil;
import org.apache.commons.lang.StringUtils;
import org.elasticsearch.action.search.SearchRequestBuilder;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.SearchType;
import org.elasticsearch.client.transport.TransportClient;
import org.elasticsearch.search.aggregations.AggregationBuilder;
import org.elasticsearch.search.aggregations.AggregationBuilders;
import org.elasticsearch.search.aggregations.bucket.terms.StringTerms;
import org.elasticsearch.search.aggregations.bucket.terms.Terms;
import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.sql.ResultSet;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 *  临时测试聚合demo，后续删除
 * @author HZY
 * @created 2018/9/3 9:08
 */
@Service
public class TestDemo {
    private final static Logger logger = LoggerFactory.getLogger(TestDemo.class);
    @Autowired
    private ElasticSearchPool elasticSearchPool;
    @Autowired
    private ElasticSearchUtil elasticSearchUtil;
    public List<Map<String, Object>> testAgg(String eventDateStart, String eventDateEnd , String org_area){
        StringBuilder stringBuilder2 = new StringBuilder();
//        stringBuilder2.append("archive_status=3;");
        stringBuilder2.append("pack_type=1;");
        stringBuilder2.append("receive_date>=" + eventDateStart + " 00:00:00;");
        stringBuilder2.append("receive_date<" + eventDateEnd + " 23:59:59;");
        if (org_area!=null) {
            stringBuilder2.append("org_area=" + org_area);
        }
        TransportClient transportClient = elasticSearchPool.getClient();
        List<Map<String, Object>> resultList = new ArrayList<>();
        SearchRequestBuilder builder = transportClient.prepareSearch("json_archives");
        builder.setTypes("info");
        builder.setSearchType(SearchType.DFS_QUERY_THEN_FETCH);
        builder.setQuery(elasticSearchUtil.getQueryBuilder(stringBuilder2.toString()));
        AggregationBuilder terms = AggregationBuilders.terms("org_area").field("org_area").size(200);
        CardinalityBuilder childTerms = AggregationBuilders.cardinality("count").field("event_no").precisionThreshold(40000);
        terms.subAggregation(childTerms);
        builder.addAggregation(terms);
        builder.setSize(0);
        builder.setExplain(true);
        SearchResponse response = builder.get();
        StringTerms longTerms = response.getAggregations().get("org_area");
        for (Terms.Bucket item : longTerms.getBuckets()) {
            Map<String, Object> temp = new HashMap<>();
            temp.put("org_area", item.getKeyAsString());
            temp.put("count11", item.getDocCount());
            resultList.add(temp);
        }
        return resultList;
    }
    public List<Map<String, Object>> testAgg2(String start,String end ) throws Exception {
        String dateField = "receive_date";
        List<Map<String, Object>> resultList = new ArrayList<>();
        List<String> orgList = new ArrayList<>();
        Map<String, Object> map = null;
        //统计有数据的医院code
        String sqlOrg = "SELECT org_area FROM json_archives/info where receive_date>= '" + start + " 00:00:00' AND receive_date<='" + end + " 23:59:59' group by org_area ";
        try {
            ResultSet resultSetOrg = elasticSearchUtil.findBySql(sqlOrg);
            while (resultSetOrg.next()) {
                String orgCode = resultSetOrg.getString("org_area");
                orgList.add(orgCode);
            }
        } catch (Exception e) {
            if (!"Error".equals(e.getMessage())) {
                e.printStackTrace();
            }
        }
        //按医院code查找，直接group by查找结果有问题
        for (String orgCode : orgList) {
            map = new HashMap<>();
            //完整数
            try {
                long starttime = System.currentTimeMillis();
                String sql3 = "";
                if (StringUtils.isNotEmpty(orgCode)) {
                    sql3 = "SELECT COUNT(DISTINCT org_area) FROM json_archives WHERE pack_type=1 AND org_area='" + orgCode + "' AND " + dateField + " BETWEEN " +
                            "'" + start + " 00:00:00' AND '" + end + " 23:59:59'";
                } else {
                    sql3 = "SELECT COUNT(DISTINCT org_area) FROM json_archives WHERE pack_type=1 AND " + dateField +
                            " BETWEEN '" + start + " 00:00:00' AND '" + end + " 23:59:59'";
                }
                ResultSet resultSet3 = elasticSearchUtil.findBySql(sql3);
                resultSet3.next();
                map.put("count", new Double(resultSet3.getObject("COUNT(DISTINCT event_no)").toString()).intValue());//就诊
                map.put("org_area",orgCode);//就诊
                resultList.add(map);
                logger.info("平台就诊人数 去重复：" + (System.currentTimeMillis() - starttime) + "ms");
            } catch (Exception e) {
                if (!"Error".equals(e.getMessage())) {
                    e.printStackTrace();
                }
            }
        }
        return resultList;
    }
    public List<Map<String, Object>>  testSearch(){
        TransportClient transportClient = elasticSearchPool.getClient();
        Map<String, Long> resMap = new HashMap<>();
        List<Map<String, Object>> resultList = new ArrayList<>();
        List<String> fileds = new ArrayList<>();
        String filters = "";
        fileds.add("count");
        fileds.add("upload_status");
        //完整数
        long total = 0;
        try {
            long starttime = System.currentTimeMillis();
            SearchRequestBuilder builder = transportClient.prepareSearch("test1");
            builder.setTypes("hzy");
            builder.setSearchType(SearchType.DFS_QUERY_THEN_FETCH);
//                builder.setQuery(elasticSearchUtil.getQueryBuilder(filters.toString()));
            AggregationBuilder terms = AggregationBuilders.terms("upload_status").field("upload_status").size(200);
            CardinalityBuilder childTerms = AggregationBuilders.cardinality("COUNT(DISTINCT org_area)").field("distinct org_area").precisionThreshold(40000);
            terms.subAggregation(childTerms);
            builder.addAggregation(terms);
            builder.setSize(0);
            builder.setFrom(0);
            Map<String,Object> sourceMap = new HashMap<>();
            List<String> include = new ArrayList<>();
            include.add("COUNT");
            sourceMap.put("includes",include);
            sourceMap.put("excludes",new ArrayList<>());
            builder.setSource(sourceMap);
            SearchResponse response = builder.get();
            StringTerms longTerms = response.getAggregations().get("upload_status");
            for (Terms.Bucket item : longTerms.getBuckets()) {
                Map<String, Object> temp = new HashMap<>();
                temp.put("upload_status", item.getKeyAsString());
                temp.put("count11", item.getDocCount());
                resultList.add(temp);
            }
            logger.info("平台就诊人数 去重复：" + (System.currentTimeMillis() - starttime) + "ms");
        } catch (Exception e) {
            if (!"Error".equals(e.getMessage())) {
                e.printStackTrace();
            }
        }
        return resultList;
    }
    public List<Map<String, Object>> testSearch2(){
        StringBuilder stringBuilder2 = new StringBuilder();
        List<Map<String, Object>> resultList = new ArrayList<>();
        List<Map<String, Object>> resultList2 = new ArrayList<>();
        TransportClient transportClient = elasticSearchPool.getClient();
        SearchRequestBuilder builder = transportClient.prepareSearch("test1");
        builder.setTypes("hzy");
        builder.setSearchType(SearchType.DFS_QUERY_THEN_FETCH);
        builder.setQuery(elasticSearchUtil.getQueryBuilder(stringBuilder2.toString()));
        AggregationBuilder terms = AggregationBuilders.terms("upload_status").field("upload_status").size(200);
        TermsBuilder childTerms = AggregationBuilders.terms("count").field("org_area") ;
        terms.subAggregation(childTerms);
        builder.addAggregation(terms);
        builder.setSize(0);
        builder.setExplain(true);
        SearchResponse response = builder.get();
        StringTerms longTerms = response.getAggregations().get("upload_status");
        for (Terms.Bucket item : longTerms.getBuckets()) {
            Map<String, Object> temp = new HashMap<>();
            temp.put("org_area", item.getKeyAsString());
            temp.put("count11", item.getDocCount());
            resultList.add(temp);
        }
        return resultList;
    }
    public void testadd(String type) throws ParseException {
        List<Map<String, Object>> list = null;
        for (int x = 0; x < 30; x++) {
            for (int i = 0; i < 10; i++) {
                list = new ArrayList<>();
                for (int j = 0; j < 10000; j++) {
                    Map<String, Object> map = new HashMap<>();
                    map.put("upload_status", i);
                    map.put("event_type", "i：" + i + "下面的：" + j);
                    map.put("org_area", type + j);
                    list.add(map);
                }
                for (int j = 0; j < 10; j++) {
                    Map<String, Object> map = new HashMap<>();
                    map.put("upload_status", i);
                    map.put("event_type", "i：" + i + "重复出来的：" + j);
                    map.put("org_area", type + j);
                    list.add(map);
                }
                elasticSearchUtil.bulkIndex("test1", "hzy", list);
            }
        }
    }
    public void testDel() throws ParseException {
        elasticSearchUtil.deleteByFilter("test1","hzy","");
    }
}

src/main/java/com/yihu/ehr/analyze/controller/dataQuality/TestDemoEndpoint.java

@@ -0,0 +1,94 @@
package com.yihu.ehr.analyze.controller.dataQuality;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.controller.EnvelopRestEndPoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
/**
 *  质控管理- 首页
 * @author HZY
 * @created 2018/8/17 11:24
 */
@RestController("/demo")
@RequestMapping(value = ApiVersion.Version1_0, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(value = "TestDemoEndpoint", description = "测试es聚合demo", tags = {"临时测试demo"})
public class TestDemoEndpoint extends EnvelopRestEndPoint {
    @Autowired
    private TestDemo testDemo;
    @RequestMapping(value = "test", method = RequestMethod.GET)
    @ApiOperation(value = "test(测试数据获取")
    public   List<Map<String, Object>>  test(
            @ApiParam(name = "start", value = "开始时间，（接收时间）")
            @RequestParam(value = "start", required = false) String start,
            @ApiParam(name = "end", value = "结束时间，（接收时间）")
            @RequestParam(value = "end", required = false) String end ,
            @ApiParam(name = "org_area", value = "org_area")
            @RequestParam(value = "org_area", required = false) String org_area
    ) throws Exception {
        List<Map<String, Object>> result = testDemo.testAgg(start, end, org_area);
        return result;
    }
    @RequestMapping(value = "test2", method = RequestMethod.GET)
    @ApiOperation(value = "test(测试数据获取")
    public   List<Map<String, Object>>  test2(
            @ApiParam(name = "start", value = "开始时间，（接收时间）")
            @RequestParam(value = "start", required = false) String start,
            @ApiParam(name = "end", value = "结束时间，（接收时间）")
            @RequestParam(value = "end", required = false) String end ,
            @ApiParam(name = "org_area", value = "org_area")
            @RequestParam(value = "org_area", required = false) String org_area
    ) throws Exception {
//        List<Map<String, Object>> result = testDemo.testAgg(start, end, org_area);
        List<Map<String, Object>> result = testDemo.testAgg2(start, end);
        return result;
    }
    @RequestMapping(value = "testAdd", method = RequestMethod.GET)
    @ApiOperation(value = "testAdd(测试数据添加")
    public   void testAdd(
            @ApiParam(name = "org_area", value = "org_area")
            @RequestParam(value = "org_area", required = false) String org_area
    ) throws Exception {
//        List<Map<String, Object>> result = testDemo.testAgg(start, end, org_area);
        testDemo.testadd(org_area);
    }
    @RequestMapping(value = "testQuery", method = RequestMethod.GET)
    @ApiOperation(value = "testQuery(测试数据查询")
    public    List<Map<String, Object>> testQuery(
    ) throws Exception {
        List<Map<String, Object>> map = testDemo.testSearch();
        return map;
    }
    @RequestMapping(value = "testQuer2y", method = RequestMethod.GET)
    @ApiOperation(value = "testQuery(测试数据查询2")
    public    List<Map<String, Object>> testQuery2(
    ) throws Exception {
        List<Map<String, Object>> map = testDemo.testSearch2();
        return map;
    }
    @RequestMapping(value = "testDel", method = RequestMethod.DELETE)
    @ApiOperation(value = "testAdd(测试数据删除")
    public   void testDel(
    ) throws Exception {
//        List<Map<String, Object>> result = testDemo.testAgg(start, end, org_area);
        testDemo.testDel();
    }
}

src/main/java/com/yihu/ehr/analyze/service/dataQuality/DataCompleteService.java

@@ -78,7 +78,7 @@ public class DataCompleteService extends DataQualityBaseService {
            }
        }
        //排序
        comparator(list);
        rateComparator(list);
        //添加总计
        if (totalHospitalNum !=0) {
            Map<String, Object> totalMap = genTotalData("上饶市",totalNum,totalHospitalNum);
@@ -128,7 +128,7 @@ public class DataCompleteService extends DataQualityBaseService {
        }
        //排序
        comparator(list);
        rateComparator(list);
        //添加总计
        if (totalHospitalNum !=0) {
            Map<String, Object> totalMap = genTotalData("全部机构", totalNum, totalHospitalNum);

src/main/java/com/yihu/ehr/analyze/service/dataQuality/DataCorrectService.java

@@ -284,7 +284,7 @@ public class DataCorrectService extends DataQualityBaseService {
            }
        }
        //排序
        comparator(list);
        rateComparator(list);
        //添加总计
        if (totalHospitalNum !=0) {
            Map<String, Object> totalMap = genTotalData("上饶市", totalNum, totalHospitalNum);
@@ -334,7 +334,7 @@ public class DataCorrectService extends DataQualityBaseService {
            }
        }
        //排序
        comparator(list);
        rateComparator(list);
        //添加总计
        if (totalHospitalNum !=0) {
            Map<String, Object> totalMap = genTotalData("全部机构", totalNum, totalHospitalNum);

src/main/java/com/yihu/ehr/analyze/service/dataQuality/DataInTimeService.java

@@ -51,46 +51,51 @@ public class DataInTimeService extends DataQualityBaseService {
     * @param end
     * @return
     */
    public Map<String, Object> getInTimeMap(Integer dataLevel,Integer eventType, String dateField, String start, String end, String orgArea) {
    public Map<String, Object> getInTimeMap(Integer dataLevel, String dateField, String start, String end, String orgArea) {
        Map<String, Object> resMap = new HashMap<>();
        double totalInTime = 0;
        //初始化 及时率预警信息
        DqPaltformReceiveWarning warning = dqPaltformReceiveWarningDao.findByOrgCode(defaultOrgCode);
        long starttime = System.currentTimeMillis();
        String sql0 = "";
        List<String> fields = new ArrayList<String>();
        fields.add("count");
        try {
            if (StringUtils.isNotEmpty(orgArea) ) {
                fields.add("org_code");
                sql0 = "SELECT  COUNT(DISTINCT event_no) as count,org_code FROM json_archives WHERE event_type=" + eventType + " AND pack_type=1 AND org_area='" + orgArea + "' AND " + dateField +
                        " BETWEEN '" + start + " 00:00:00' AND '" + end + " 23:59:59' and delay <=" + warning.getPeInTime() + " GROUP BY org_code";
            } else if (  dataLevel ==0 && StringUtils.isEmpty(orgArea)){
                fields.add("org_area");
                sql0 = "SELECT  COUNT(DISTINCT event_no) as count,org_area FROM json_archives WHERE event_type=" + eventType + " AND pack_type=1 AND " + dateField +
                        " BETWEEN '" + start + " 00:00:00' AND '" + end + " 23:59:59' and delay <=" + warning.getPeInTime() + " GROUP BY org_area";
            }else  if (  dataLevel ==1 && StringUtils.isEmpty(orgArea)){
                fields.add("org_code");
                sql0 = "SELECT  COUNT(DISTINCT event_no) as count,org_area FROM json_archives WHERE event_type=" + eventType + " AND pack_type=1 AND " + dateField +
                        " BETWEEN '" + start + " 00:00:00' AND '" + end + " 23:59:59' and delay <=" + warning.getPeInTime() + " GROUP BY org_code";
        //获取有数据的医院code列表
        List<String> orgList = hasDataHospital(dateField, start, end);
        for (String orgCode : orgList) {
            //初始化 及时率预警信息
            DqPaltformReceiveWarning warning = dqPaltformReceiveWarningDao.findByOrgCode(orgCode);
            if (warning == null) {
                warning = dqPaltformReceiveWarningDao.findByOrgCode(defaultOrgCode);
            }
            long starttime = System.currentTimeMillis();
            String sql0 = "";
            List<String> fields = new ArrayList<String>();
            fields.add("count");
            fields.add("org_code");
            try {
                if (StringUtils.isNotEmpty(orgArea)) {
                    sql0 = "SELECT  COUNT(DISTINCT event_no) as count,org_code FROM json_archives WHERE  pack_type=1 AND org_area='" + orgArea + "' AND " + dateField +
                            " BETWEEN '" + start + " 00:00:00' AND '" + end + " 23:59:59' and delay <=" + warning.getPeInTime() + " GROUP BY org_code";
                } else {
                    sql0 = "SELECT  COUNT(DISTINCT event_no) as count,org_code FROM json_archives WHERE  pack_type=1 AND " + dateField +
                            " BETWEEN '" + start + " 00:00:00' AND '" + end + " 23:59:59' and delay <=" + warning.getPeInTime() + " GROUP BY org_code";
                }
            List<Map<String, Object>> resultSet0 = elasticSearchUtil.findBySql(fields, sql0);
            if (resultSet0 != null && resultSet0.size() > 0) {
                for (Map<String, Object> map : resultSet0) {
                    if (StringUtils.isNotEmpty(orgArea) || ( dataLevel ==1 && StringUtils.isEmpty(orgArea))) {
                        resMap.put(map.get("org_code").toString(), map.get("count"));
                    } else {
                        resMap.put(map.get("org_area").toString(), map.get("count"));
                List<Map<String, Object>> resultSet0 = elasticSearchUtil.findBySql(fields, sql0);
                for (Map<String, Object> orgData : resultSet0) {
                    if (dataLevel == 0) {
                        //区域级别分组
                        String org = orgData.get("org_code").toString();
                        double newValue = (double) orgData.get("count");
                        String area = redisClient.get("organizations:" + org + ":area");
                        double oldValue = resMap.get(area) == null ? 0 : (double) resMap.get(area);
                        resMap.put(area, oldValue + newValue);
                    } else if (dataLevel == 1) {
                        //机构级别分组
                        resMap.put(orgData.get("org_code").toString(), orgData.get("count"));
                    }
                }
            }
            logger.info("平台就诊及时人数 去重复：" + (System.currentTimeMillis() - starttime) + "ms");
        } catch (Exception e) {
            if (!"Error".equals(e.getMessage())) {
                e.printStackTrace();
                logger.info("平台就诊及时人数 去重复：" + (System.currentTimeMillis() - starttime) + "ms");
            } catch (Exception e) {
                if (!"Error".equals(e.getMessage())) {
                    e.printStackTrace();
                }
            }
        }
        return resMap;
@@ -104,28 +109,19 @@ public class DataInTimeService extends DataQualityBaseService {
     * @param end
     * @return
     */
    public Map<String, Object> getInTimeMap(Integer dataLevel,String dateField, String start, String end, String orgArea) {
    public Map<String, Object> getInTimeDataMap(Integer dataLevel, String dateField, String start, String end, String orgArea) {
        Map<String, Object> resMap = new HashMap<>();
        double totalAreaCout = 0;//总计
        double totalInTime = 0;//就诊及时数
        //初始化 及时率预警信息
        DqPaltformReceiveWarning warning = dqPaltformReceiveWarningDao.findByOrgCode(defaultOrgCode);
        double totalInTime = 0;//总计就诊及时数
        long starttime = System.currentTimeMillis();
        //获取及时数组
        Map<String, Object> outPatientInTimeMap = getInTimeMap(dataLevel,0, dateField, start, end, orgArea); //门诊及时数
        Map<String, Object> inPatientInTimeMap = getInTimeMap(dataLevel,1, dateField, start, end, orgArea); //住院及时数
        Map<String, Object> examInTimeMap = getInTimeMap(dataLevel,2, dateField, start, end, orgArea); //体检及时数
        for (String key : outPatientInTimeMap.keySet()) {
            double outpatientInTime = getDoubleValue(outPatientInTimeMap.get(key));
            double inpatientInTime = getDoubleValue(inPatientInTimeMap.get(key));
            double examInTime = getDoubleValue(examInTimeMap.get(key));
            totalInTime = outpatientInTime + inpatientInTime + examInTime; // //就诊及时性
            resMap.put(key, totalInTime);
            totalAreaCout += totalInTime;
        resMap = getInTimeMap(dataLevel, dateField, start, end, orgArea); //就诊及时数
        for (String key : resMap.keySet()) {
            double outpatientInTime = getDoubleValue(resMap.get(key));
            totalInTime += outpatientInTime; // //就诊及时性
        }
        //指定数据类型
        if (dataLevel ==0) {
        if (dataLevel == 0) {
            resMap.put("type", "org_area");
        } else {
            resMap.put("type", "org_code");
@@ -133,7 +129,7 @@ public class DataInTimeService extends DataQualityBaseService {
        //总计
        if (!resMap.isEmpty()) {
            resMap.put("", totalAreaCout);
            resMap.put("", totalInTime);
        }
        logger.info("平台就诊及时人数 去重复：" + (System.currentTimeMillis() - starttime) + "ms");
@@ -144,16 +140,16 @@ public class DataInTimeService extends DataQualityBaseService {
    /* ******************************** 区域层级模块相关 ***********************************/
    @Override
    public List<Map<String, Object>> getAreaDataQuality(Integer dataLevel,String startDate, String endDate) throws Exception {
    public List<Map<String, Object>> getAreaDataQuality(Integer dataLevel, String startDate, String endDate) throws Exception {
        String end = DateUtil.addDate(1, endDate, DateUtil.DEFAULT_DATE_YMD_FORMAT);
        Map<String, Object> resMap = null;
        List<Map<String, Object>> list = new ArrayList<>();
        double totalNum = 0;//平台总数
        double totalHospitalNum = 0;//医院总数
        //机构数据
        List<Map<String, Object>> groupList = dataCorrectService.getOrgDataMap(dataLevel,"create_date", startDate, end, null);
        List<Map<String, Object>> groupList = dataCorrectService.getOrgDataMap(dataLevel, "create_date", startDate, end, null);
        //平台接收数据量
        Map<String, Object> platformDataGroup = getInTimeMap(dataLevel,"receive_date", startDate, endDate, null);
        Map<String, Object> platformDataGroup = getInTimeDataMap(dataLevel, "receive_date", startDate, endDate, null);
        // 计算
        for (Map<String, Object> map : groupList) {
            resMap = new HashMap<String, Object>();
@@ -182,9 +178,9 @@ public class DataInTimeService extends DataQualityBaseService {
            }
        }
        //排序
        comparator(list);
        rateComparator(list);
        //添加总计
        if (totalHospitalNum !=0) {
        if (totalHospitalNum != 0) {
            Map<String, Object> totalMap = genTotalData("上饶市", totalNum, totalHospitalNum);
            list.add(0, totalMap);
        }
@@ -192,16 +188,16 @@ public class DataInTimeService extends DataQualityBaseService {
    }
    @Override
    public List<Map<String, Object>> getOrgDataQuality(Integer dataLevel,String areaCode, String startDate, String endDate) throws Exception {
    public List<Map<String, Object>> getOrgDataQuality(Integer dataLevel, String areaCode, String startDate, String endDate) throws Exception {
        String end = DateUtil.addDate(1, endDate, DateUtil.DEFAULT_DATE_YMD_FORMAT);
        Map<String, Object> resMap = null;
        List<Map<String, Object>> list = new ArrayList<>();
        double totalNum = 0;//平台总数
        double totalHospitalNum = 0;//医院总数
        //机构数据
        List<Map<String, Object>> groupList = dataCorrectService.getOrgDataMap(dataLevel,"create_date", startDate, end, areaCode);
        List<Map<String, Object>> groupList = dataCorrectService.getOrgDataMap(dataLevel, "create_date", startDate, end, areaCode);
        //平台接收数据量
        Map<String, Object> platformDataGroup = getInTimeMap(dataLevel,"receive_date", startDate, endDate, areaCode);
        Map<String, Object> platformDataGroup = getInTimeDataMap(dataLevel, "receive_date", startDate, endDate, areaCode);
        // 计算
        for (Map<String, Object> map : groupList) {
            resMap = new HashMap<String, Object>();
@@ -230,9 +226,9 @@ public class DataInTimeService extends DataQualityBaseService {
            }
        }
        //排序
        comparator(list);
        rateComparator(list);
        //添加总计
        if (totalHospitalNum !=0) {
        if (totalHospitalNum != 0) {
            Map<String, Object> totalMap = genTotalData("全部机构", totalNum, totalHospitalNum);
            list.add(0, totalMap);
        }

src/main/java/com/yihu/ehr/analyze/service/dataQuality/DataQualityBaseService.java

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.sql.ResultSet;
import java.util.*;
/**
@@ -70,20 +71,36 @@ public abstract class DataQualityBaseService extends BaseJpaService {
    }
    /**
     * 通过map中的rate字段降序排列
     * 通过map中的rate字段降序排列，并添加% 号
     * @param list
     */
    public void comparator(List<Map<String, Object>> list ){
        Collections.sort(list, new Comparator<Map<String, Object>>() {
            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
                return getDoubleValue(o2.get("rate")).compareTo(getDoubleValue(o1.get("rate")));
            }
        });
    public void rateComparator(List<Map<String, Object>> list ){
        comparator(list,"rate",1);
        list.forEach(map->{
            map.put("rate",map.get("rate") + "%");
        });
    }
    /**
     * 根据map中的字段排序
     * @param list           map集合
     * @param orderField    排序字段
     * @param order          排序顺序  0：正序，1：降序
     */
    public void comparator(List<Map<String, Object>> list ,String orderField,int order){
        Collections.sort(list, new Comparator<Map<String, Object>>() {
            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
                if (order==0) {
                    return getDoubleValue(o1.get(orderField)).compareTo(getDoubleValue(o2.get(orderField)));
                }else if (order==1) {
                    return getDoubleValue(o2.get(orderField)).compareTo(getDoubleValue(o1.get(orderField)));
                }else {
                    return 0;
                }
            }
        });
    }
    /**
     * 百分比计算（不带单位）
@@ -173,4 +190,60 @@ public abstract class DataQualityBaseService extends BaseJpaService {
        }
    }
    /**
     * 获取有数据的医院
     * @param dateField  过滤时间字段
     * @param start       起始时间
     * @param end          截止时间
     * @return
     */
    public List<String> hasDataHospital(String dateField,String start,String end){
        //统计有数据的医院code
        String sqlOrg = "";
        List<String> list = new ArrayList<>();
         sqlOrg = "SELECT org_code FROM json_archives/info where "+ dateField +">= '" + start + " 00:00:00' AND "+dateField+"<='" + end + " 23:59:59' group by org_code ";
        try {
            ResultSet resultSetOrg = elasticSearchUtil.findBySql(sqlOrg);
            while (resultSetOrg.next()) {
                String orgCode = resultSetOrg.getString("org_code");
                if (StringUtils.isNotEmpty(orgCode)) {
                    list.add(orgCode);
                }
            }
        } catch (Exception e) {
            if (!"Error".equals(e.getMessage())) {
                e.printStackTrace();
            }
        }
        return list;
    }
    /**
     * 获取有数据的区县
     * @param dateField
     * @param start
     * @param end
     * @return
     */
    public List<String> hasDataArea(String dateField,String start,String end){
        //统计有数据的区域code
        String sqlOrg = "";
        List<String> list = new ArrayList<>();
        sqlOrg = "SELECT org_area FROM json_archives/info where "+ dateField +">= '" + start + " 00:00:00' AND "+dateField+"<='" + end + " 23:59:59' group by org_area ";
        try {
            ResultSet resultSetOrg = elasticSearchUtil.findBySql(sqlOrg);
            while (resultSetOrg.next()) {
                String orgCode = resultSetOrg.getString("org_code");
                if (StringUtils.isNotEmpty(orgCode)) {
                    list.add(orgCode);
                }
            }
        } catch (Exception e) {
            if (!"Error".equals(e.getMessage())) {
                e.printStackTrace();
            }
        }
        return list;
    }
}

src/main/java/com/yihu/ehr/analyze/service/dataQuality/DataQualityHomeService.java

@@ -49,12 +49,9 @@ public class DataQualityHomeService extends BaseJpaService {
    @Autowired
    private RedisClient redisClient;
    @Autowired
    private DataCompleteService dataCompleteService;
    @Autowired
    private ApplicationContext context;
    private Map<DqDataType, DataQualityBaseService> dqBaseServiceMap;
    @PostConstruct
    private void init() {
        dqBaseServiceMap = new HashMap<>();
@@ -177,9 +174,6 @@ public class DataQualityHomeService extends BaseJpaService {
            end = dateStr;
        }
        //初始化 及时率预警信息
        DqPaltformReceiveWarning warning = dqPaltformReceiveWarningDao.findByOrgCode(defaultOrgCode);
        int totalHospitalNum = 0;//医院总就诊数
        double hospitalOutpatientNum = 0;//总门诊数
        double hospitalExamNum = 0;//总体检数
@@ -208,10 +202,10 @@ public class DataQualityHomeService extends BaseJpaService {
        totalExamNum = Double.valueOf(dataMap.get("peIntegrity").toString());//体检完整数
        totalVisitNum = Double.valueOf(dataMap.get("visitIntegrity").toString());//就诊完整数
        //3. 及时数
        totalInTime = getInTimeNum("receive_date" ,start, end, warning);
        // 3. 准确数
        totalInTime = getInTimeNum("receive_date" ,start, end);
        // 3. 去重准确数
        totalCorrect = getErrorDataSetData("receive_date",start, end, null);
        //4. 数据集总条数
        //4. 数据集总量
        int dataSetsMun = getDataSetsMap(start, end, null);
        totalMap.put("orgCode", cloud);//机构code
@@ -292,7 +286,7 @@ public class DataQualityHomeService extends BaseJpaService {
     * @return
     */
    public int getDataSetsMap(String start, String end, String orgCode) throws IOException {
        // TODO 数据集总量
        //  数据集总量
        int totalNum = 0;
        String dateStr = DateUtil.toString(new Date());
        if (StringUtils.isBlank(start)) {
@@ -310,48 +304,50 @@ public class DataQualityHomeService extends BaseJpaService {
        List<Map<String, Object>> dataSets = elasticSearchUtil.list("json_archives_qc", "qc_dataset_detail", stringBuilder1.toString());
        for (Map<String, Object> dataSet : dataSets) {
            for (Map.Entry<String, Object> entry : dataSet.entrySet()) {
                totalNum += (Integer) dataSet.get("row");
                totalNum += (Integer) dataSet.get("count");
            }
        }
        return totalNum;
    }
    /**
     *  获取及时上传数
     *  获取所有及时上传数
     * @param dateField  时间区间查询字段
     * @param start
     * @param end
     * @param warning  预警信息
     * @return
     */
    public double getInTimeNum(String dateField,String start, String end, DqPaltformReceiveWarning warning) {
    public double getInTimeNum(String dateField,String start, String end) {
        double totalInTime = 0;
        //及时率
        try {
        Map<String, Object> resMap = new HashMap<>();
        DataQualityBaseService dataQualityBaseService = getInstance(DqDataType.create(1));
        //获取有数据的医院code列表
        List<String> orgList = dataQualityBaseService.hasDataHospital(dateField, start, end);
        for (String orgCode : orgList) {
            //初始化 及时率预警信息
            DqPaltformReceiveWarning warning = dqPaltformReceiveWarningDao.findByOrgCode(orgCode);
            if (warning == null) {
                warning = dqPaltformReceiveWarningDao.findByOrgCode(defaultOrgCode);
            }
            long starttime = System.currentTimeMillis();
            String sql0 = "SELECT COUNT(DISTINCT event_no) FROM json_archives WHERE event_type=2 AND pack_type=1 AND " + dateField +
                    " BETWEEN '" + start + " 00:00:00' AND '" + end + " 23:59:59' and delay <=" + warning.getPeInTime();
            String sql1 = "SELECT COUNT(DISTINCT event_no) FROM json_archives WHERE event_type=1 AND pack_type=1 AND " + dateField +
                    " BETWEEN '" + start + " 00:00:00' AND '" + end + " 23:59:59' and delay <=" + warning.getHospitalInTime();
            String sql2 = "SELECT COUNT(DISTINCT event_no) FROM json_archives WHERE event_type=0 AND pack_type=1 AND " + dateField +
                    " BETWEEN '" + start + " 00:00:00' AND '" + end + " 23:59:59' and delay <=" + warning.getOutpatientInTime();
            String sql0 = "";
            List<String> fields = new ArrayList<String>();
            fields.add("count");
            try {
                sql0 = "SELECT  COUNT(DISTINCT event_no) as count FROM json_archives WHERE  pack_type=1 AND org_code='" + orgCode + "' AND " + dateField +
                        " BETWEEN '" + start + " 00:00:00' AND '" + end + " 23:59:59' and delay <=" + warning.getPeInTime() ;
                List<Map<String, Object>> resultSet0 = elasticSearchUtil.findBySql(fields, sql0);
                for (Map<String, Object> orgData : resultSet0) {
                    double newValue = (double) orgData.get("count");
                    totalInTime +=newValue;
                }
            ResultSet resultSet0 = elasticSearchUtil.findBySql(sql0);
            ResultSet resultSet1 = elasticSearchUtil.findBySql(sql1);
            ResultSet resultSet2 = elasticSearchUtil.findBySql(sql2);
            resultSet0.next();
            resultSet1.next();
            resultSet2.next();
            double outpatientInTime = new Double(resultSet2.getObject("COUNT(DISTINCT event_no)").toString());//门诊及时数
            double inpatientInTime = new Double(resultSet1.getObject("COUNT(DISTINCT event_no)").toString());//住院及时数
            double examInTime = new Double(resultSet0.getObject("COUNT(DISTINCT event_no)").toString());//体检及时数
            totalInTime = outpatientInTime + inpatientInTime + examInTime; // //就诊及时性
            logger.info("平台就诊及时人数 去重复：" + (System.currentTimeMillis() - starttime) + "ms");
        } catch (Exception e) {
            if (!"Error".equals(e.getMessage())) {
                e.printStackTrace();
                logger.info("平台就诊及时人数 去重复：" + (System.currentTimeMillis() - starttime) + "ms");
            } catch (Exception e) {
                if (!"Error".equals(e.getMessage())) {
                    e.printStackTrace();
                }
            }
        }
        return totalInTime;
@@ -481,6 +477,8 @@ public class DataQualityHomeService extends BaseJpaService {
        for(Map<String,Object> map:list){
            map.put("dataset_name", redisClient.get("std_data_set_" + map.get("version") + ":" + map.get("dataset") + ":name"));
        }
        DataQualityBaseService dataQualityBaseService = getInstance(DqDataType.create(1));
        dataQualityBaseService.comparator(list,"count",1);//降序排序
        return list;
    }
@@ -523,6 +521,9 @@ public class DataQualityHomeService extends BaseJpaService {
        for(Map<String,Object> map:list){
            map.put("metadata_name", redisClient.get("std_meta_data_" + map.get("version") + ":" + map.get("dataset")+"."+ map.get("metadata")+ ":name"));
        }
        DataQualityBaseService dataQualityBaseService = getInstance(DqDataType.create(1));
        dataQualityBaseService.comparator(list,"count",1);//降序排序
        return list;
    }
}

src/main/java/com/yihu/ehr/analyze/service/dataQuality/WarningQuestionService.java

@@ -73,7 +73,7 @@ public class WarningQuestionService extends BaseJpaService {
    public void receive(String dateStr){
        Session session = currentSession();
        //0.获取医院数据
        Query query1 = session.createSQLQuery("SELECT org_code,full_name from organizations where org_type = 'Hospital'");
        Query query1 = session.createSQLQuery("SELECT org_code,full_name from organizations");
        List<Object[]> orgList = query1.list();
        Map<String, String> orgMap = new HashedMap(orgList.size());
        orgList.forEach(one->{

src/main/java/com/yihu/ehr/analyze/service/pack/PackStatisticsService.java

@@ -3,6 +3,7 @@ package com.yihu.ehr.analyze.service.pack;
import com.yihu.ehr.elasticsearch.ElasticSearchPool;
import com.yihu.ehr.elasticsearch.ElasticSearchUtil;
import com.yihu.ehr.query.BaseJpaService;
import com.yihu.ehr.redis.client.RedisClient;
import com.yihu.ehr.util.datetime.DateUtil;
import com.yihu.ehr.util.rest.Envelop;
import org.apache.commons.lang.ObjectUtils;
@@ -11,15 +12,9 @@ import org.elasticsearch.action.search.SearchRequestBuilder;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.SearchType;
import org.elasticsearch.client.transport.TransportClient;
import org.elasticsearch.search.aggregations.AggregationBuilder;
import org.elasticsearch.search.aggregations.AggregationBuilders;
import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramBuilder;
import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
import org.elasticsearch.search.aggregations.bucket.terms.LongTerms;
import org.elasticsearch.search.aggregations.bucket.terms.StringTerms;
import org.elasticsearch.search.aggregations.metrics.valuecount.InternalValueCount;
import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -43,6 +38,8 @@ public class PackStatisticsService extends BaseJpaService {
    private ElasticSearchPool elasticSearchPool;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private RedisClient redisClient;
    /**
     * getRecieveOrgCount 根据接收日期统计各个医院的数据解析情况
     *
@@ -928,16 +925,26 @@ public class PackStatisticsService extends BaseJpaService {
     * @return
     * @throws Exception
     */
    public Envelop getReceiveNum(String startDate, String endDate) throws Exception {
    public Envelop getReceiveNum(String startDate, String endDate, String orgArea) throws Exception {
        Envelop envelop = new Envelop();
        List<Map<String, Object>> res = new ArrayList<>();
        String city = getCurrentCity();
        res = getAreaList(city);
        List<Map<String, Object>> res  = getReceive(startDate, endDate ,orgArea);
        for(Map<String, Object> map : res){
            map.put("receiveNum",getReceive(startDate, endDate, map.get("ID")+""));
            map.put("analyzeNum",getAnalyzer(startDate, endDate, map.get("ID")+""));
            map.put("uploadNum",getUpload(startDate, endDate, map.get("ID")+""));
            if(StringUtils.isNotEmpty(orgArea)){
                map.put("analyzeNum",getAnalyzer(startDate, endDate,"", map.get("org_code")+""));
                map.put("uploadNum",getUpload(startDate, endDate, "", map.get("org_code")+""));
            }else{
                map.put("analyzeNum",getAnalyzer(startDate, endDate, map.get("org_area")+"",""));
                map.put("uploadNum",getUpload(startDate, endDate, map.get("org_area")+"",""));
            }
        }
        Collections.sort(res, new Comparator<Map<String, Object>>() {
            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
                Integer num1 = Double.valueOf(o1.get("receiveNum")+"").intValue();
                Integer num2 = Double.valueOf(o2.get("receiveNum")+"").intValue();
                return num2.compareTo(num1);
            }
        });
        envelop.setObj(res);
        envelop.setSuccessFlg(true);
        return envelop;
@@ -959,30 +966,61 @@ public class PackStatisticsService extends BaseJpaService {
        return jdbcTemplate.queryForList("select id,name from address_dict where pid = "+city);
    }
    private long getReceive(String startDate, String endDate ,String area){
        StringBuilder stringBuilder = new StringBuilder();
        stringBuilder.append("pack_type=1;");
        stringBuilder.append("receive_date>=" + startDate + " 00:00:00;");
        stringBuilder.append("receive_date<" + endDate + " 23:59:59;");
        stringBuilder.append("org_area="+area+";");
        return elasticSearchUtil.count("json_archives","info",stringBuilder.toString());
    private List<Map<String,Object>> getReceive(String startDate, String endDate ,String area) throws Exception{
        List<String> fields = new ArrayList<>();
        fields.add("receiveNum");
        String sql = "";
        if(StringUtils.isNotEmpty(area)){
            fields.add("org_code");
            sql = "SELECT org_code ,COUNT(org_code) as receiveNum from json_archives/info where pack_type=1 and org_area='" + area + "' and " +
                    "receive_date >='" + startDate + " 00:00:00' and receive_date <='" + endDate + " 23:59:59' group by org_code";
        }else{
            fields.add("org_area");
            sql = "SELECT org_area ,COUNT(org_area) as receiveNum from json_archives/info where pack_type=1  and " +
                    "receive_date >='" + startDate + " 00:00:00' and receive_date <='" + endDate + " 23:59:59' group by org_area";
        }
        List<Map<String, Object>>  resultList = elasticSearchUtil.findBySql(fields, sql);
        //设置机构，区域名称
        if (resultList != null && resultList.size() > 0) {
            for (Map<String, Object> map : resultList) {
                String name = "";
                if (StringUtils.isNotEmpty(area)) {
                    String code = (String) map.get("org_code");
                    name = redisClient.get("organizations:" + code + ":name");
                }else {
                    String code = (String) map.get("org_area");
                    name = redisClient.get("area:" + code + ":name");
                }
                map.put("name",name);
            }
        }
        return resultList;
    }
    private long getAnalyzer(String startDate, String endDate ,String area){
    private long getAnalyzer(String startDate, String endDate ,String area, String orgCode){
        StringBuilder stringBuilder = new StringBuilder();
        stringBuilder.append("archive_status=3;pack_type=1;");
        stringBuilder.append("parse_date>=" + startDate + " 00:00:00;");
        stringBuilder.append("parse_date<" + endDate + " 23:59:59;");
        stringBuilder.append("org_area="+area+";");
        if(StringUtils.isNotEmpty(area)){
            stringBuilder.append("org_area="+area+";");
        }
        if(StringUtils.isNotEmpty(orgCode)){
            stringBuilder.append("org_code="+orgCode+";");
        }
        return elasticSearchUtil.count("json_archives","info",stringBuilder.toString());
    }
    private long getUpload(String startDate, String endDate ,String area){
    private long getUpload(String startDate, String endDate ,String area, String orgCode){
        StringBuilder stringBuilder = new StringBuilder();
        stringBuilder.append("archive_status=3;pack_type=1;");
        stringBuilder.append("create_date>=" + startDate + " 00:00:00;");
        stringBuilder.append("create_date<" + endDate + " 23:59:59;");
        stringBuilder.append("org_area="+area+";");
        return elasticSearchUtil.count("upload","info",stringBuilder.toString());
        if(StringUtils.isNotEmpty(area)){
            stringBuilder.append("org_area="+area+";");
        }
        if(StringUtils.isNotEmpty(orgCode)){
            stringBuilder.append("org_code="+orgCode+";");
        }
        return elasticSearchUtil.count("upload","record",stringBuilder.toString());
    }
}

src/main/resources/application.yml

@@ -51,7 +51,7 @@ analyze:
    cronExp: 0/1 * * * * ? #质控任务触发间隔表达式
quality:
  orgCode : 1 #默认机构
  orgCode : jkzl #默认机构
  version: 59083976eebd #默认版本号
  cloud: medicalCloud #默认云平台code
  cloudName: 上饶医疗云 #默认云平台name