suqinyi 1 jaar geleden
bovenliggende
commit
fd4879da8c

File diff suppressed because it is too large
+ 2 - 2
business/base-service/src/main/java/com/yihu/jw/wlyy/wlyyhttp/WlyyHttpService.java


+ 57 - 2
business/es-service/src/main/java/com/yihu/jw/es/service/StatisticsEsService.java

@ -6445,7 +6445,20 @@ public class StatisticsEsService {
            listOfLists.add(list05);
            listOfLists.add(list05);
            //数据转换
            //数据转换
            List<Map<String, Object>> list = mergeAndSortLists(listOfLists, "1");
            List<Map<String, Object>> list = mergeAndSortLists(listOfLists, "1");
            result.put("resultList", list);
            //条件过滤科室
            if (StringUtils.isNotBlank(qvo.getDeptCode())) {
                List<Map<String, Object>> filterDeptList = new ArrayList<>();
                for (Map<String, Object> map : list) {
                    if (qvo.getDeptCode().equals(map.get("deptCode").toString())) {
                        filterDeptList.add(map);
                    }
                }
                result.put("resultList", filterDeptList);
                result.put("resultListSize", filterDeptList.size());
            } else {
                result.put("resultList", list);
                result.put("resultListSize", list.size());
            }
        }
        }
        //查医生
        //查医生
@ -6484,7 +6497,35 @@ public class StatisticsEsService {
            listOfLists.add(list05);
            listOfLists.add(list05);
            //数据转换
            //数据转换
            List<Map<String, Object>> list = mergeAndSortLists(listOfLists, "2");
            List<Map<String, Object>> list = mergeAndSortLists(listOfLists, "2");
            //过滤科室和医生
            if (StringUtils.isNotBlank(qvo.getDeptCode()) || StringUtils.isNotBlank(qvo.getDeptName())) {
                List<Map<String, Object>> filterDoctortList = new ArrayList<>();
                if (StringUtils.isNotBlank(qvo.getDeptCode()) && StringUtils.isNotBlank(qvo.getDoctorName())) {
                    //科室
                    for (Map<String, Object> map : list) {
                        if (qvo.getDeptCode().equals(map.get("deptCode").toString())) {
                            filterDoctortList.add(map);
                        }
                    }
                    //医生
                    for (Map<String, Object> map : filterDoctortList) {
                        if (map.get("doctorName").toString().contains(qvo.getDoctorName())) {
                            filterDoctortList.add(map);
                        }
                    }
                }
                if (StringUtils.isBlank(qvo.getDeptCode()) && StringUtils.isNotBlank(qvo.getDoctorName())) {
                    for (Map<String, Object> map : list) {
                        if (map.get("doctorName").toString().contains(qvo.getDoctorName())) {
                            filterDoctortList.add(map);
                        }
                    }
                }
                result.put("resultList", filterDoctortList);
                result.put("resultListSize", filterDoctortList.size());
            }
            result.put("resultList", list);
            result.put("resultList", list);
            result.put("resultListSize", list.size());
        }
        }
        return result;
        return result;
    }
    }
@ -7680,6 +7721,19 @@ public class StatisticsEsService {
        return list;
        return list;
    }
    }
    /**
     * 查询用户基本信息
     */
    public Map<String, Object> getPatientInfo(ScreenQvo qvo) {
        String sql="SELECT id 'patientId',`name` 'patientName',idcard,ssc,birthday,  TIMESTAMPDIFF(YEAR, birthday, CURDATE()) AS age ,mobile,address,phone \n" +
                "FROM base_patient WHERE idcard='"+qvo.getIdcard()+"' AND del='1'";
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        if (!list.isEmpty()){
            return list.get(0);
        }
        return null;
    }
    /**
    /**
     * 调用i健康的接口查询家庭信息【市民健康】
     * 调用i健康的接口查询家庭信息【市民健康】
@ -7694,9 +7748,10 @@ public class StatisticsEsService {
     * 调用i健康就诊情况
     * 调用i健康就诊情况
     */
     */
    public JSONObject getEventByIjk(ScreenQvo qvo) {
    public JSONObject getEventByIjk(ScreenQvo qvo) {
        String param = "?&ssc=" + qvo.getSsc() + "&type=1&page=1&pageSize=20";
        String param = "?&idcard=" + qvo.getIdcard() + "ssc=" + qvo.getSsc() + "&type=1&page=1&pageSize=100";
        JSONObject re = wlyyHttpService.sendWlyyMesGet("getEventList", param);
        JSONObject re = wlyyHttpService.sendWlyyMesGet("getEventList", param);
        return re;
        return re;
    }
    }
}
}

File diff suppressed because it is too large
+ 19 - 3
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/statistics/EsStatisticsEndpoint.java