Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/dingding/DingDingMessageEndpoint.java

@@ -28,8 +28,8 @@ public class DingDingMessageEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = "sendDingDingMessageToOne")
    @ApiOperation(value = "发送钉钉消息")
    public ObjEnvelop sendDingDingMessage(@ApiParam @RequestParam(required = false)String sendId,
                                          @ApiParam @RequestParam(required = false)String receiverId,
                                          @ApiParam @RequestParam(required = false)String content,
                                          @ApiParam @RequestParam(required = true)String receiverId,
                                          @ApiParam @RequestParam(required = true)String content,
                                          @ApiParam @RequestParam(required = false,defaultValue = "text")String msgtype,
                                          @ApiParam @RequestParam(required = false)String url,
                                          @ApiParam @RequestParam(required = false)String title){

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/statistics/OpenStatisticsEndpoint.java

@@ -409,6 +409,22 @@ public class OpenStatisticsEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = "getCareServerList")
    @ApiOperation("获取照护服务列表")
    public PageEnvelop getCareServerList(@ApiParam @RequestParam(required = false) String name,
                                         @ApiParam @RequestParam(required = false) String idCard,
                                         @ApiParam @RequestParam(required = false) String area,
                                         @ApiParam @RequestParam(required = false) Integer status,
                                         @ApiParam @RequestParam(required = false,defaultValue = "1") Integer page,
                                         @ApiParam @RequestParam(required = false,defaultValue = "10") Integer pageSize){
        try{
            return statisticsService.getCareServerList(name, idCard, area, status, page, pageSize);
        }catch (Exception e){
            return failedPageEnvelopException2(e);
        }
    }
    @GetMapping(value = "getServerSituationItem")
    @ApiOperation("获取老人服务项目数量情况(助老服务、紧急救助、医生服务)")
    public ObjEnvelop getServerSituationItem(@RequestParam(required = true) String endDate,

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/patient/CarePatientService.java

@@ -833,6 +833,21 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
            re.put("helperTotal",findHelperTotal(name,area,level,filter));
        }
        if("4".equals(type)||StringUtils.isBlank(type)){
            String testDoctorSql= " SELECT dict_code from wlyy_hospital_sys_dict WHERE dict_name = 'jkzl_doctor'";
            String doctorSql = "SELECT d.id,d.photo,d.`name`,d.openid,h.org_name FROM " +
                    "base_doctor d,base_doctor_hospital h WHERE d.id=h.doctor_code" +
                    " AND h.del = 1 AND d.del = 1 AND d.doctor_level = 1 AND d.id NOT IN ("+testDoctorSql+")";
            String doctorTotalSql = "SELECT count(d.id) total FROM " +
                    "base_doctor d,base_doctor_hospital h WHERE d.id=h.doctor_code" +
                    " AND h.del = 1 AND d.del = 1 AND d.doctor_level = 1 AND d.id NOT IN ("+testDoctorSql+")";
            List<Map<String, Object>> list = jdbcTemplate.queryForList(doctorSql);
            Integer integer = jdbcTemplate.queryForObject(doctorTotalSql, Integer.class);
            re.put("doctor",list);
            re.put("doctorTotal",integer);
        }
        if("5".equals(type)||StringUtils.isBlank(type)){//老人家属
            filter = "";
            String sqltmp = "SELECT GROUP_CONCAT(dict_code) orgCodes from wlyy_hospital_sys_dict WHERE dict_name = 'jkzl_olderRelative' ";

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/statistics/StatisticsService.java

@@ -826,6 +826,9 @@ public class StatisticsService {
        Integer streetOldTotal = 0;
        Integer streetOldOff = 0;
        Integer streetOldOn = 0;
        Integer doctorON = 0; //医生
        Integer doctorOff = 0;
        Integer doctorTotal = 0;
        //儿童注册人数
@@ -1011,8 +1014,24 @@ public class StatisticsService {
        olderFamilyBinding = jdbcTemplate.queryForObject(sql2,Integer.class);
        //医生
        String doctorSqlTotal = "SELECT count(d.id) AS count, if(d.openid is null,0,1) online FROM base_doctor d WHERE  d.del = 1 AND d.doctor_level = 1 AND d.id NOT IN " +
                "(SELECT dict_code from wlyy_hospital_sys_dict WHERE dict_name = 'jkzl_doctor') GROUP BY openid ";
        List<Map<String, Object>> doctorCountList = jdbcTemplate.queryForList(doctorSqlTotal);
        for (Map<String, Object> dcm : doctorCountList) {
            Integer num = Integer.valueOf(dcm.get("count").toString());
            Integer online = Integer.valueOf(dcm.get("online").toString());
            if (0==online){
                doctorOff+=num;
            }
            if (1==online){
                doctorON+=num;
            }
        }
        doctorTotal = doctorOff + doctorON;
        //helper 社工，teacher 教师，child 幼儿，olderWx 老人公众号，olderPad 老人平板 olderFamily老人家属  street 街道老人二次导入朝辉街道
        //helper4助老员 unSignOlder社区老人
        //helper4助老员 unSignOlder社区老人 doctor 医生
        result.put("olderTotal", olderTotal);
        result.put("olderOn", olderOn);
        result.put("olderOff", olderOff);
@@ -1026,6 +1045,10 @@ public class StatisticsService {
        result.put("unSignOlderOff", unSignOlderOff);
        result.put("unSignOlderOn", unSignOlderOn);
        result.put("doctorTotal",doctorTotal);
        result.put("doctorOn",doctorON);
        result.put("doctorOff",doctorOff);
        result.put("helperTotal", helperTotal);
        result.put("helperOff", helperOff);
        result.put("helperOn", helperOn);
@@ -2461,6 +2484,37 @@ public class StatisticsService {
    }
    public PageEnvelop getCareServerList(String name,String idCard,String area,Integer status,Integer page,Integer pageSize){
        page = page>0?page-1:0;
        String olderFilter = " and EXISTS ( select 1 from  " +
                " base_service_package_sign_record sr,base_service_package_record r, base_service_package_item i,base_service_package pack " +
                " where sr.id = r.sign_id and sr.status=1 and r.service_package_id = i.service_package_id and r.service_package_id = pack.id  and i.del = 1 " +
                " and sr.`status`=1 and CONVERT(sr.patient USING utf8)  = life.patient " +
                " and CONVERT(sr.patient USING utf8) not in (SELECT dict_code FROM `base`.`wlyy_hospital_sys_dict` WHERE `dict_name` = 'jkzl_older' or dict_name='jkzl_child')  ) ";
        String pageSql = " order by life.create_time desc limit "+page*pageSize+","+pageSize;
        String headSql = "SELECT life.id,life.number,life.patient,life.patient_name patientName,life.patient_phone patientPhone,life.hospital,life.hospital_name hospitalName,CAST(DATE_FORMAT(life.create_time,'%Y-%m-%d %H:%i:%S') as char) createTime,de.name serviceName,p.idcard,p.residential_area residentialArea ";
        String countSql = "SELECT count(*) ";
        String tableSql = " FROM base_life_care_order life left join base_life_care_fee_detail de on life.id = de.order_id left join base_patient p on life.patient = p.id where 1=1 ";
        if(StringUtils.isNotBlank(name)){
            tableSql += " and p.name like '%"+name+"%' ";
        }
        if(StringUtils.isNotBlank(idCard)){
            tableSql += " and p.idcard like '%"+idCard+"%' ";
        }
        if(StringUtils.isNotBlank(area)){
            tableSql += " and p.residential_area like '%"+area+"%' ";
        }
        if(status == null){
            tableSql += " and life.status in (1,2,3) ";
        }else {
            tableSql += " and life.status = "+status + " ";
        }
        List<Map<String, Object>> list = jdbcTemplate.queryForList(headSql + tableSql + olderFilter+pageSql);
        Long count = jdbcTemplate.queryForObject(countSql + tableSql + olderFilter, Long.class);
        return PageEnvelop.getSuccessListWithPage("获取成功",list,page,pageSize,count);
    }
    /**
     *获取老人服务情况(助老服务、紧急救助、医生服务 项目数量)
     */