|
@ -68,7 +68,9 @@ public class DataCompleteService extends DataQualityBaseService {
|
|
|
if (!"".equals(code)) {
|
|
|
resMap.put("code", code);
|
|
|
resMap.put("name", map.get("name"));
|
|
|
//平台接收,去重后的数据
|
|
|
resMap.put("count", platPormNum);
|
|
|
//医院的数据(质控上报的数据)
|
|
|
resMap.put("total", orgNum);
|
|
|
resMap.put("rate", rate);
|
|
|
totalNum += platPormNum;
|
|
@ -165,17 +167,17 @@ public class DataCompleteService extends DataQualityBaseService {
|
|
|
//添加标识,标识是机构数据
|
|
|
resMap.put("type", "org_code");
|
|
|
fields.add("org_code");
|
|
|
sql1 = "SELECT count(DISTINCT event_no) as count ,org_code FROM json_archives/info where pack_type=1 and org_area='" + orgArea + "' and " +
|
|
|
sql1 = "SELECT count(DISTINCT profile_id) as count ,org_code FROM json_archives/info where pack_type=1 and analyze_status=3 and org_area='" + orgArea + "' and " +
|
|
|
dateField + ">='" + start + " 00:00:00' and " + dateField + "<='" + end + " 23:59:59' group by org_code";
|
|
|
} else if (StringUtils.isEmpty(orgArea) && (dataLevel == 0 && StringUtils.isEmpty(orgArea))) {
|
|
|
resMap.put("type", "org_area");
|
|
|
fields.add("org_area");
|
|
|
sql1 = "SELECT count(DISTINCT event_no) as count ,org_area FROM json_archives/info where pack_type=1 and " +
|
|
|
sql1 = "SELECT count(DISTINCT profile_id) as count ,org_area FROM json_archives/info where pack_type=1 and analyze_status=3 and " +
|
|
|
dateField + ">='" + start + " 00:00:00' and " + dateField + "<='" + end + " 23:59:59' group by org_area";
|
|
|
} else if (StringUtils.isEmpty(orgArea) && (dataLevel == 1 && StringUtils.isEmpty(orgArea))) {
|
|
|
resMap.put("type", "org_code");
|
|
|
fields.add("org_code");
|
|
|
sql1 = "SELECT count(DISTINCT event_no) as count ,org_code FROM json_archives/info where pack_type=1 and " +
|
|
|
sql1 = "SELECT count(DISTINCT profile_id) as count ,org_code FROM json_archives/info where pack_type=1 and analyze_status=3 and " +
|
|
|
dateField + ">='" + start + " 00:00:00' and " + dateField + "<='" + end + " 23:59:59' group by org_code";
|
|
|
}
|
|
|
|