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/lifeCare/DoctorLifeCareEndpoint.java

@@ -212,4 +212,24 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
        }
    }
    @PostMapping("wisdomCare")
    @ApiOperation(value = "医生端-智慧照护")
    public Envelop wisdomCare(@ApiParam(value = "医生code", name = "doctor")
                              @RequestParam(value = "doctor", required = true) String doctor,
                              @ApiParam(value = "医生id", name = "orgCode")
                              @RequestParam(value = "orgCode", required = true) String orgCode){
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("doctorId",permissionService.getUID());
        if (permissionService.noPermission(1, jsonObject)) {
            return ObjEnvelop.getError("该操作没有权限",-1);
        }
        try {
           return ObjEnvelop.getSuccess("获取成功",lifeCareOrderService.wisdomCare(doctor, orgCode),200) ;
        } catch (Exception e) {
            return failedObjEnvelopException2(e);
        }
    }
}

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

@@ -1057,4 +1057,22 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
        }
    }
    /**
     * 智慧照护
     */
    public JSONObject wisdomCare(String doctor,String orgCode){
        JSONObject jsonObject = new JSONObject();
        String sql = "SELECT DISTINCT id,`code`,`name`,pad_icon_img,life_care_img FROM base_life_care_item_dict WHERE org_code" +
                " = (SELECT DISTINCT org_code FROM base_team_member WHERE del =1 AND doctor_code = '"+doctor+"' )";
        List<Map<String, Object>> careList = jdbcTemplate.queryForList(sql);
        jsonObject.put("care",careList);
        String totalSql ="SELECT fd.`code` AS `code`,COUNT(fd.`code`) AS total ,fd.`name` AS `name` FROM base_life_care_order co LEFT JOIN " +
           " base_life_care_fee_detail fd ON co.id = fd.order_id WHERE co.hospital = '"+orgCode+"' AND co.status = -1 GROUP BY fd.`code`";
        List<Map<String, Object>> total = jdbcTemplate.queryForList(totalSql);
        jsonObject.put("total",total);
        return jsonObject;
    }
}