Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/desizenMan/service_project_management.jsp

@@ -497,7 +497,7 @@
                    });
					console.log(t);
                    var grade = '',price = '',itemType='',hospitalGrade='';
					$('.item-title').text(t.hospitalServiceItem.serviceItemName);
					$('.item-title').text(t.hospitalServiceItem.specialistServiceItemDO.title);
                    t.hospitalServiceItem.specialistServiceItemDO.itemType == 0 ? itemType = '诊疗服务':itemType = '健康服务';
					$('.item-type').text(itemType);
					$('.item-content').text(t.hospitalServiceItem.specialistServiceItemDO.content);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/team/AdminTeamController.java

@@ -172,7 +172,8 @@ public class AdminTeamController extends BaseController {
    @RequestMapping(value = "/{team_id}/members", method = RequestMethod.GET)
    @ApiOperation(value = "获取团队成员")
    public String getTeamMembers(@PathVariable("team_id") long teamId) {
    public String getTeamMembers(@PathVariable("team_id") long teamId,
                                 @RequestParam(value = "available", required = false) String available) {//true或者空过滤，false不过滤
        try {
            List<Object[]> members = memberService.findMembers(teamId);
            List<Map<String,Object>> list = new ArrayList<>();
@@ -181,7 +182,14 @@ public class AdminTeamController extends BaseController {
                map = copyBeanProperties(member[0], "id", "code", "name", "hospital", "jobName", "level", "sex", "photo");
                map.put("available",member[1]);
                map.put("count",member[2]);
                //默认过滤只显示有效的(true或者空过滤)，false或者不为空才不过滤
                if(StringUtils.isBlank(available) || "true".equals(available)){
                    if(!(Boolean)member[1]){
                        continue;
                    }
                }
                list.add(map);
                
            }
            return write(200, "OK", "data", new JSONArray(list));
        } catch (Exception e) {