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

svr/svr-base/src/main/java/com/yihu/jw/base/service/lifeCare/LifeCareService.java

@@ -48,7 +48,7 @@ public class LifeCareService {
        filter +=" GROUP BY dict.`code` ";
        filter += " order by dict.org_code,dict.sort asc ";
        filter += " order by dict.sort,dict.org_code ASC ";
        filter += " limit "+(page-1)*size+","+size;
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql+filter);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/doctor/admin/AdminInfoEndpoint.java

@@ -467,4 +467,28 @@ public class AdminInfoEndpoint extends EnvelopRestEndpoint {
    }
    @GetMapping(value = "statisticsOldAdd")
    @ApiOperation(value = "管理端首页智慧照护生活照料项目新增情况")
    public ObjEnvelop statisticsOldAdd(
            @RequestParam(required = true) String endDate,
            @RequestParam(required = true) String area,
            @RequestParam(required = true) Integer level,
            @ApiParam(name="type",value="类型：1本周，2本月",defaultValue = "")@RequestParam(required = false) String type) {
        try {
            JSONObject param = new JSONObject();
            String doctorId =  permissionService.getUID();
            param.put("doctorId",doctorId);
            if(permissionService.noPermission(0,param)){
                return ObjEnvelop.getError("该操作没有权限");
            }
            JSONObject result = statisticsService.statisticsOldAdd(endDate,area,level, type);
            return success(result);
        } catch (Exception e) {
            return failedObjEnvelopException2(e);
        }
    }
}

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

@@ -651,6 +651,17 @@ public class OpenStatisticsEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = "findDictEmeStatus")
    @ApiOperation(value = "紧急预警状态字典")
    public ListEnvelop findDictEmeStatus(){
        try {
            return success(statisticsService.findDictEmeStatus());
        } catch (Exception e) {
            e.printStackTrace();
            return failedListEnvelopException2(e);
        }
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/lifeCare/LifeCareOrderService.java

@@ -466,18 +466,19 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
    }
    /**
     * 查找服务项字典
     *  查找服务项字典
     *   v1.7.1 机构的生活照料服务项目必须配置才有返回
     *   v1.7.6 一个生活照料对应多个机构
     * @return
     */
    public List<LifeCareItemDictDO> findItemDict(String orgCode){
        String sql = "select dict.id,dict.`code`,dict.`name`," +
                " GROUP_CONCAT( DISTINCT dict.org_code SEPARATOR ',' ) AS orgCode,dict.life_care_img,dict.pad_icon_img  " +
                " from base_life_care_item_dict dict LEFT JOIN base_org org  on dict.org_code = org.`code` where 1=1 " ;
                " from base_life_care_item_dict dict INNER JOIN base_org org  on dict.org_code = org.`code` where 1=1 " ;
        if (StringUtils.isNotBlank(orgCode)){
            sql += " and dict.org_code='"+orgCode+"' ";
        }
        sql+=  " and dict.del=1  GROUP BY dict.`code` order by dict.sort asc ";
        sql+=  " and dict.del=1 AND org.del = 1  GROUP BY dict.`code` order by dict.sort asc ";
        List<LifeCareItemDictDO> lifeCareItemDictList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(LifeCareItemDictDO.class));
@@ -524,9 +525,14 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
        int start = 0 == page ? page++ : (page - 1) * size;
        int end = 0 == size ? 15 : size;
        String fedSql = " ";
        String oOrgCodeSql ="";
        if (StringUtils.isNotBlank(fedCode)){
            String fedOrgCode ="";
            if (StringUtils.isNotBlank(orgCode))fedOrgCode="  AND cid.org_code = '"+orgCode+"'";
            if (StringUtils.isNotBlank(orgCode)){
                fedOrgCode="  AND cid.org_code = '"+orgCode+"'";
                oOrgCodeSql = " AND o.hospital = '"+orgCode+"' ";
            }
            fedSql = " and EXISTS ( " +
                    " select 1 from base_life_care_fee_detail fed LEFT JOIN base_life_care_item_dict cid ON fed.code = cid.code where fed.order_id = o.id and fed.code='"+fedCode+"' " + fedOrgCode +
                    "  )  ";
@@ -534,7 +540,7 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
        String sql = "SELECT *  FROM  base_life_care_order o " +
                " WHERE (o.patient = '{patient}' or o.proxy_patient = '{patient}') "+
                " AND (o.`status` = {status} or -100 = {status})" +fedSql+
                " AND (o.`status` = {status} or -100 = {status})"+ oOrgCodeSql + fedSql+
                "  group by o.id " +
                " ORDER BY o.create_time desc" +
                " LIMIT {start},{end} ";
@@ -547,7 +553,7 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
        String countSql = "SELECT count(DISTINCT o.id) FROM base_life_care_order o " +
                " WHERE  " +
                "  (o.patient = '{patient}' or o.proxy_patient = '{patient}') " +
                " AND (o.`status` = {status} or -100 = {status})"+fedSql;
                " AND (o.`status` = {status} or -100 = {status})"+oOrgCodeSql+fedSql;
        String finqlCountSql = countSql.replace("{patient}", patient)
                .replace("{status}", String.valueOf(status));