区域检验-统计接口1

pom.xml

@@ -56,12 +56,10 @@
			<groupId>com.yihu.ehr</groupId>
			<artifactId>commons-web</artifactId>
		</dependency>
		<dependency>
			<groupId>com.yihu.ehr</groupId>
			<artifactId>commons-data-mysql</artifactId>
		</dependency>
		<dependency>
			<groupId>com.yihu.ehr</groupId>
			<artifactId>commons-util</artifactId>
@@ -70,7 +68,15 @@
			<groupId>com.yihu.ehr</groupId>
			<artifactId>commons-rest-model</artifactId>
		</dependency>
		<dependency>
			<groupId>com.yihu.ehr</groupId>
			<artifactId>commons-data-solr</artifactId>
		</dependency>
		<dependency>
			<groupId>com.yihu.ehr</groupId>
			<artifactId>commons-data-query</artifactId>
			<scope>compile</scope>
		</dependency>
	</dependencies>
	<build>

src/main/java/com/yihu/ehr/SvrInspectionApplication.java

@@ -5,10 +5,13 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.cloud.netflix.feign.EnableFeignClients;
import org.springframework.data.web.config.EnableSpringDataWebSupport;
@EnableEurekaClient
@EnableDiscoveryClient
@EnableFeignClients
@SpringBootApplication
public class SvrInspectionApplication extends SpringBootServletInitializer {

src/main/java/com/yihu/ehr/svrinspection/controller/AssistanceApplyController.java

@@ -1,14 +1,11 @@
package com.yihu.ehr.svrinspection.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.ehr.controller.BaseController;
import com.yihu.ehr.controller.EnvelopRestEndPoint;
import com.yihu.ehr.model.user.MRoleReportRelation;
import com.yihu.ehr.svrinspection.commons.exception.ManageException;
import com.yihu.ehr.svrinspection.model.AssistanceApplyModel;
import com.yihu.ehr.svrinspection.service.AssistanceApplyService;
import com.yihu.ehr.svrinspection.service.SolrStatisticsService;
import com.yihu.ehr.util.rest.Envelop;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -26,8 +23,6 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
import static com.yihu.ehr.constants.ServiceApi.AppPushMessage.list;
/**
 *  机构检验申请控制类
 *
@@ -43,15 +38,18 @@ public class AssistanceApplyController extends EnvelopRestEndPoint {
    private ObjectMapper objectMapper;
    @Autowired
    private AssistanceApplyService assistanceApplyService;
    @Autowired
    private SolrStatisticsService solrStatisticsService;
    @GetMapping(value = "/area")
    @ApiOperation(value = "区域检验-【区域排行】")
    public Envelop examAreaRanking(
            @ApiParam(name = "eventDate", value = "就诊时间（年月）", defaultValue = "")
            @RequestParam(value = "eventDate", required = false) String eventDate) throws IOException {
            @ApiParam(name = "pid", value = "上级区域编码", defaultValue = "361100")
            @RequestParam(value = "pid", required = false,defaultValue = "361100") Integer pid,
            @ApiParam(name = "eventDate", value = "就诊时间（年月）",required = true, defaultValue = "")
            @RequestParam(value = "eventDate", required = false) String eventDate) throws Exception {
        String demoData = "[{\"areaCode\":\"test\",\"areaName\":\"测试区域\",\"count\":100},{\"areaCode\":\"test2\",\"areaName\":\"测试区域2\",\"count\":100}]";
        List list = objectMapper.readValue(demoData,List.class);
        List<Map<String,Object>> list = solrStatisticsService.areaGroupCount(pid,"org_area",eventDate);
        return success(list);
    }
@@ -61,15 +59,19 @@ public class AssistanceApplyController extends EnvelopRestEndPoint {
            @ApiParam(name = "areaCode", value = "区域编码", defaultValue = "")
            @RequestParam(value = "areaCode", required = false) String areaCode,
            @ApiParam(name = "eventDate", value = "就诊时间（年月）", defaultValue = "")
            @RequestParam(value = "eventDate", required = false) String eventDate) throws IOException {
        String demoData = "[{\"orgCode\":\"test1\",\"orgName\":\"测试机构1\",\"count\":100},{\"orgCode\":\"test2\",\"orgName\":\"测试机构2\",\"count\":100}]";
        List list = objectMapper.readValue(demoData,List.class);
            @RequestParam(value = "eventDate", required = false) String eventDate)  {
        List<Map<String,Object>> list = null;
        try {
            list = solrStatisticsService.hospitalGroupCount(areaCode,"org_code",eventDate);
        } catch (Exception e) {
            failed(e.getMessage());
        }
        return success(list);
    }
    @GetMapping(value = "/statistics")
    @ApiOperation(value = "区域检验-【统计信息】")
    @ApiOperation(value = "区域检验数-【统计信息】",notes = "包含今日新增量，检验次数业务分布【医生端，市政端共用】")
    public Envelop statistics(
            @ApiParam(name = "orgCode", value = "机构编码（不传默认全市）", defaultValue = "")
            @RequestParam(value = "orgCode", required = false) String orgCode,
@@ -118,7 +120,7 @@ public class AssistanceApplyController extends EnvelopRestEndPoint {
    @ApiOperation(value = "下级机构申请详情-查看")
    public Envelop applyDetail(
            @ApiParam(name = "applyId", value = "申请记录ID")
            @RequestParam(value = "applyId", required = false) int applyId) throws IOException {
            @RequestParam(value = "applyId", required = false) int applyId) {
        AssistanceApplyModel applyModel = assistanceApplyService.findById(applyId);
        return success(applyModel);
@@ -129,7 +131,7 @@ public class AssistanceApplyController extends EnvelopRestEndPoint {
    @PostMapping(value = "apply",consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    public Envelop createAssistanceApply(
            @ApiParam(name = "dictionary", value = "档案申请JSON结构")
            @RequestBody AssistanceApplyModel apply) throws IOException {
            @RequestBody AssistanceApplyModel apply)  {
        AssistanceApplyModel save = assistanceApplyService.save(apply);
        return success(save);
@@ -143,10 +145,17 @@ public class AssistanceApplyController extends EnvelopRestEndPoint {
            @ApiParam(name = "replyUserId", value = "处理人ID", defaultValue = "")
            @RequestParam(value = "replyUserId", required = false) String replyUserId,
            @ApiParam(name = "replyContent", value = "回复内容", defaultValue = "")
            @RequestParam(value = "replyContent", required = false) String replyContent) throws ManageException {
        AssistanceApplyModel save = assistanceApplyService.solutionApply(applyId,replyUserId,replyContent);
            @RequestParam(value = "replyContent", required = false) String replyContent)  {
        AssistanceApplyModel save = null;
        try {
            save = assistanceApplyService.solutionApply(applyId,replyUserId,replyContent);
        } catch (ManageException e) {
            return failed(e.getMessage());
        }
        return success(save);
    }
}

src/main/java/com/yihu/ehr/svrinspection/feign/AddressClient.java

@@ -0,0 +1,43 @@
package com.yihu.ehr.svrinspection.feign;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.constants.MicroServices;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.ehr.model.common.ObjectResult;
import com.yihu.ehr.model.geography.MGeography;
import com.yihu.ehr.model.geography.MGeographyDict;
import com.yihu.ehr.model.org.MOrganization;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Collection;
import java.util.List;
/**
 * Created by AndyCai on 2016/1/20.
 */
@FeignClient(name=MicroServices.Geography)
@RequestMapping(ApiVersion.Version1_0)
@ApiIgnore
public interface AddressClient {
    @RequestMapping(value = "/geography_entries/pid/{pid}", method = RequestMethod.GET)
    @ApiOperation(value = "根据上级编号查询行政区划地址")
    List<MGeographyDict> getAddressDictByPid(
            @ApiParam(name = "pid", value = "上级id", defaultValue = "")
            @PathVariable(value = "pid") Integer pid) ;
    @ApiOperation(value = "根据地区代码获取机构列表")
    @RequestMapping(value = "/organizations/areas/{area}", method = RequestMethod.GET)
    public List<MOrganization> getOrganizationByAreaCode(
            @ApiParam(name = "area", value = "地区代码", defaultValue = "")
            @PathVariable(value = "area") String area);
}

src/main/java/com/yihu/ehr/svrinspection/service/AssistanceApplyService.java

@@ -30,7 +30,7 @@ public class AssistanceApplyService  extends BaseJpaService<AssistanceApplyModel
    public AssistanceApplyModel solutionApply(int id,String replyUserId,String replyContent) throws ManageException {
        AssistanceApplyModel applyModel = findById(id);
        if (applyModel == null) {
            throw new ManageException("申请不存在！");
            throw new ManageException("申请记录不存在！");
        }
        applyModel.setSolutionUserId(replyUserId);
        applyModel.setSolutionReply(replyContent);

src/main/java/com/yihu/ehr/svrinspection/service/SolrStatisticsService.java

@@ -0,0 +1,188 @@
package com.yihu.ehr.svrinspection.service;
import com.yihu.ehr.model.geography.MGeographyDict;
import com.yihu.ehr.model.org.MOrganization;
import com.yihu.ehr.profile.core.ResourceCore;
import com.yihu.ehr.solr.SolrUtil;
import com.yihu.ehr.svrinspection.commons.exception.ManageException;
import com.yihu.ehr.svrinspection.feign.AddressClient;
import com.yihu.ehr.util.log.LogService;
import org.apache.commons.lang.StringUtils;
import org.apache.solr.client.solrj.response.FacetField;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.*;
/**
 *  检验数据统计-solr
 * @author HZY
 * @created 2018/11/15 14:01
 */
@Component
public class SolrStatisticsService {
    private static String core = ResourceCore.SubTable;
    @Autowired
    private AddressClient addressClient;
    @Autowired
    private SolrUtil solrUtil;
    /**
     *  区域检验统计分布
     *
     * @param pid           上级区域编码
     * @param field         分组字段
     * @param eventDate
     * @return
     * @throws Exception
     */
    public List<Map<String,Object>> areaGroupCount(Integer pid, String field, String eventDate) throws Exception {
       List<Map<String,Object>> resultList = new ArrayList<>();
        StringBuilder fq = new StringBuilder();
        Map<String, Long> result = new TreeMap<>();
        String q = "(rowkey:*HDSD00_79* OR rowkey:*HDSD00_77*)";//solr细表中的检查检验
        if (StringUtils.isBlank(eventDate)) {
            LogService.getLogger().error("eventDate is null,check your params");
            throw new Exception("eventDate is null,check your params");
        }
        //事件日期
        fq.append("event_date:[" + eventDate + "T00:00:00Z TO " + eventDate + "T23:59:59Z]");
        //统计查询
        Map<String, Long> facetField = solrUtil.groupCount(core,q, fq.toString(),field, 0, -1);
        //获取区县列表
        List<MGeographyDict> addressList = addressClient.getAddressDictByPid(pid);
        addressList.stream().forEach(address ->{
            Map<String,Object> areaData = areaData = new HashMap<>();
            areaData.put("areaCode",address.getPid());
            areaData.put("areaName",address.getName());
            if (facetField.get(String.valueOf(address.getId())) == null) {
                areaData.put("count",0);
            }else {
                areaData.put("count",facetField.get(String.valueOf(address.getId())));
            }
            resultList.add(areaData);
        });
        comparator(resultList,"count");
        return resultList;
    }
    public List<Map<String,Object>> hospitalGroupCount(String areaCode, String field, String eventDate) throws Exception {
        List<Map<String,Object>> resultList = new ArrayList<>();
        StringBuilder fq = new StringBuilder();
        String q = "(rowkey:*HDSD00_79* OR rowkey:*HDSD00_77*)";//solr细表中的检查检验
        if (StringUtils.isBlank(areaCode)) {
            throw new ManageException("areaCode is null,check your params");
        }
        if (StringUtils.isBlank(eventDate)) {
            throw new ManageException("eventDate is null,check your params");
        }
        //区域编码
        fq.append("org_area:"+areaCode);
        //事件日期
        fq.append(" && event_date:[" + eventDate + "T00:00:00Z TO " + eventDate + "T23:59:59Z]");
        //统计查询
        Map<String, Long> facetField = solrUtil.groupCount(core,q, fq.toString(),field, 0, -1);
        //获取区县列表
        List<MOrganization> addressList = addressClient.getOrganizationByAreaCode(areaCode);
        addressList.stream().forEach(organization ->{
            Map<String,Object> areaData = areaData = new HashMap<>();
            areaData.put("orgCode",organization.getOrgCode());
            areaData.put("orgName",organization.getFullName());
            if (facetField.get(organization.getOrgCode()) == null) {
                areaData.put("count",0);
            }else {
                areaData.put("count",facetField.get(organization.getOrgCode()));
            }
            resultList.add(areaData);
        });
        comparator(resultList,"count");
        return resultList;
    }
    public Map<String, Long> examGroupRanking(String field,  String eventDate,  boolean missing) throws Exception {
        StringBuilder fq = new StringBuilder();
        Map<String, Long> result = new TreeMap<>();
        if (StringUtils.isBlank(eventDate)) {
            LogService.getLogger().error("eventDate is null,check your params");
            throw new Exception("eventDate is null,check your params");
        }
        fq.append("(rowkey:*HDSD00_79* OR rowkey:*HDSD00_77*)");
        //事件日期
        fq.append(" && event_date:[" + eventDate + "T00:00:00Z TO " + eventDate + "T23:59:59Z]");
        //统计查询
        FacetField facetField = solrUtil.getFacetField(core, field, fq.toString(), 1, 0, -1, missing);
        if (facetField != null) {
            List<FacetField.Count> values = facetField.getValues();
            long total = 0;
            //查询结果处理
            for (FacetField.Count value : values) {
                //key为null或空字符串的统一为""
                String key = StringUtils.isBlank(value.getName()) ? "" : value.getName();
                long val = value.getCount();
                if (key.length() == 0 && result.get(key) != null) {
                    val += result.get(key);
                }
                result.put(key, val);
                total += val;
            }
            if (result.containsKey("") && result.get("") < 1) {
                result.remove("");
            }
        }
        return result;
    }
    /**
     *  降序排序
     * @param list          排序集合
     * @param orderField    排序字段
     */
    public void comparator(List<Map<String, Object>> list ,String orderField){
        Collections.sort(list, new Comparator<Map<String, Object>>() {
            @Override
            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
                return getIntegerValue(o2.get(orderField)).compareTo(getIntegerValue(o1.get(orderField)));
            }
        });
    }
    /**
     * 获取值
     * @param objValue
     * @return
     */
    public Integer getIntegerValue(Object objValue) {
        int value = 0;
        try {
            if (objValue != null)
                value = Integer.parseInt(objValue.toString());
        } catch (Exception e) {
            e.printStackTrace();
        }
        return value;
    }
}

src/main/resources/application.yml

@@ -23,3 +23,30 @@ spring:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: chenweishan
    password: chenweishan
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com:2181/solr
---
spring:
  profiles: test
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: chenweishan
    password: chenweishan
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com:2181/solr
---
spring:
  profiles: prod
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: chenweishan
    password: chenweishan
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com:2181/solr