|  | @ -61,7 +61,6 @@ public class SpecialistController extends BaseController {
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |     @RequestMapping(value = "findLabelbyType", method = RequestMethod.GET)
 |  |     @RequestMapping(value = "findLabelbyType", method = RequestMethod.GET)
 | 
												
													
														
															|  |     @ResponseBody
 |  | 
 | 
												
													
														
															|  |     @ApiOperation("获取标签")
 |  |     @ApiOperation("获取标签")
 | 
												
													
														
															|  |     public String findLabelbyType(@ApiParam(name = "type", value = "标签类型") @RequestParam(required = true) String type,
 |  |     public String findLabelbyType(@ApiParam(name = "type", value = "标签类型") @RequestParam(required = true) String type,
 | 
												
													
														
															|  |                                   @ApiParam(name = "teamCode", value = "团队id") @RequestParam(required = false) Long teamCode) {
 |  |                                   @ApiParam(name = "teamCode", value = "团队id") @RequestParam(required = false) Long teamCode) {
 | 
												
											
												
													
														
															|  | @ -74,7 +73,6 @@ public class SpecialistController extends BaseController {
 | 
												
													
														
															|  |     }
 |  |     }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |     @RequestMapping(value = "findLabelAndPatientCount", method = RequestMethod.GET)
 |  |     @RequestMapping(value = "findLabelAndPatientCount", method = RequestMethod.GET)
 | 
												
													
														
															|  |     @ResponseBody
 |  | 
 | 
												
													
														
															|  |     @ApiOperation("获取标签与居民数量")
 |  |     @ApiOperation("获取标签与居民数量")
 | 
												
													
														
															|  |     public String findLabelAndPatientCount(@ApiParam(name = "doctor", value = "医生") @RequestParam(required = true)String doctor,
 |  |     public String findLabelAndPatientCount(@ApiParam(name = "doctor", value = "医生") @RequestParam(required = true)String doctor,
 | 
												
													
														
															|  |                                            @ApiParam(name = "type", value = "标签类型") @RequestParam(required = true)String type,
 |  |                                            @ApiParam(name = "type", value = "标签类型") @RequestParam(required = true)String type,
 | 
												
											
												
													
														
															|  | @ -87,8 +85,7 @@ public class SpecialistController extends BaseController {
 | 
												
													
														
															|  |         }
 |  |         }
 | 
												
													
														
															|  |     }
 |  |     }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |         @RequestMapping(value = "findSpecialistPatientRelationCout", method = RequestMethod.GET)
 |  | 
 | 
												
													
														
															|  |     @ResponseBody
 |  | 
 | 
												
													
														
															|  | 
 |  |     @RequestMapping(value = "findSpecialistPatientRelationCout", method = RequestMethod.GET)
 | 
												
													
														
															|  |     @ApiOperation("获取专科医生下未分配标签居民数目")
 |  |     @ApiOperation("获取专科医生下未分配标签居民数目")
 | 
												
													
														
															|  |     public String findSpecialistPatientRelationCout(@ApiParam(name = "doctor", value = "医生code") @RequestParam(required = true) String doctor) {
 |  |     public String findSpecialistPatientRelationCout(@ApiParam(name = "doctor", value = "医生code") @RequestParam(required = true) String doctor) {
 | 
												
													
														
															|  |         try {
 |  |         try {
 | 
												
											
												
													
														
															|  | @ -101,7 +98,6 @@ public class SpecialistController extends BaseController {
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |     @RequestMapping(value = "findNoLabelPatientRelation", method = RequestMethod.GET)
 |  |     @RequestMapping(value = "findNoLabelPatientRelation", method = RequestMethod.GET)
 | 
												
													
														
															|  |     @ResponseBody
 |  | 
 | 
												
													
														
															|  |     @ApiOperation("获取专科医生下未分配标签居民")
 |  |     @ApiOperation("获取专科医生下未分配标签居民")
 | 
												
													
														
															|  |     public String findNoLabelPatientRelation(@ApiParam(name = "doctor", value = "医生code") @RequestParam(required = true) String doctor) {
 |  |     public String findNoLabelPatientRelation(@ApiParam(name = "doctor", value = "医生code") @RequestParam(required = true) String doctor) {
 | 
												
													
														
															|  |         try {
 |  |         try {
 | 
												
											
												
													
														
															|  | @ -113,7 +109,6 @@ public class SpecialistController extends BaseController {
 | 
												
													
														
															|  |     }
 |  |     }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |     @RequestMapping(value = "findPatientRelatioByAssistant", method = RequestMethod.GET)
 |  |     @RequestMapping(value = "findPatientRelatioByAssistant", method = RequestMethod.GET)
 | 
												
													
														
															|  |     @ResponseBody
 |  | 
 | 
												
													
														
															|  |     @ApiOperation("获取计管师下未分配标签居民")
 |  |     @ApiOperation("获取计管师下未分配标签居民")
 | 
												
													
														
															|  |     public String findPatientRelatioByAssistant(@ApiParam(name = "assistant", value = "计管师") @RequestParam(required = true) String assistant,
 |  |     public String findPatientRelatioByAssistant(@ApiParam(name = "assistant", value = "计管师") @RequestParam(required = true) String assistant,
 | 
												
													
														
															|  |                                                 @ApiParam(name = "page", value = "第几页,1开始") @RequestParam(required = true) Integer page,
 |  |                                                 @ApiParam(name = "page", value = "第几页,1开始") @RequestParam(required = true) Integer page,
 | 
												
											
												
													
														
															|  | @ -127,7 +122,6 @@ public class SpecialistController extends BaseController {
 | 
												
													
														
															|  |     }
 |  |     }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |     @RequestMapping(value = "saveHealthAssistant", method = RequestMethod.POST)
 |  |     @RequestMapping(value = "saveHealthAssistant", method = RequestMethod.POST)
 | 
												
													
														
															|  |     @ResponseBody
 |  | 
 | 
												
													
														
															|  |     @ApiOperation("分配计管师居民")
 |  |     @ApiOperation("分配计管师居民")
 | 
												
													
														
															|  |     public String saveHealthAssistant(String json) {
 |  |     public String saveHealthAssistant(String json) {
 | 
												
													
														
															|  |         try {
 |  |         try {
 | 
												
											
												
													
														
															|  | @ -139,7 +133,6 @@ public class SpecialistController extends BaseController {
 | 
												
													
														
															|  |     }
 |  |     }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |     @RequestMapping(value = "getPatientByLabel", method = RequestMethod.POST)
 |  |     @RequestMapping(value = "getPatientByLabel", method = RequestMethod.POST)
 | 
												
													
														
															|  |     @ResponseBody
 |  | 
 | 
												
													
														
															|  |     @ApiOperation("获取标签下居民")
 |  |     @ApiOperation("获取标签下居民")
 | 
												
													
														
															|  |     public String getPatientByLabel(@ApiParam(name = "doctor", value = "医生code") @RequestParam(required = true)String doctor,
 |  |     public String getPatientByLabel(@ApiParam(name = "doctor", value = "医生code") @RequestParam(required = true)String doctor,
 | 
												
													
														
															|  |                                     @ApiParam(name = "labelType", value = "标签类型")@RequestParam(required = true) String labelType,
 |  |                                     @ApiParam(name = "labelType", value = "标签类型")@RequestParam(required = true) String labelType,
 | 
												
											
												
													
														
															|  | @ -155,7 +148,6 @@ public class SpecialistController extends BaseController {
 | 
												
													
														
															|  |     }
 |  |     }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |     @RequestMapping(value = "findDoctorTeamMenmber", method = RequestMethod.GET)
 |  |     @RequestMapping(value = "findDoctorTeamMenmber", method = RequestMethod.GET)
 | 
												
													
														
															|  |     @ResponseBody
 |  | 
 | 
												
													
														
															|  |     @ApiOperation("获取团队及团队成员")
 |  |     @ApiOperation("获取团队及团队成员")
 | 
												
													
														
															|  |     public String findDoctorTeamMenmber(@ApiParam(name = "doctor", value = "医生code") @RequestParam(required = true)String doctor) {
 |  |     public String findDoctorTeamMenmber(@ApiParam(name = "doctor", value = "医生code") @RequestParam(required = true)String doctor) {
 | 
												
													
														
															|  |         try {
 |  |         try {
 | 
												
											
												
													
														
															|  | @ -167,7 +159,6 @@ public class SpecialistController extends BaseController {
 | 
												
													
														
															|  |     }
 |  |     }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |     @RequestMapping(value = "getDoctorInHospital", method = RequestMethod.GET)
 |  |     @RequestMapping(value = "getDoctorInHospital", method = RequestMethod.GET)
 | 
												
													
														
															|  |     @ResponseBody
 |  | 
 | 
												
													
														
															|  |     @ApiOperation("获取院内工作人员")
 |  |     @ApiOperation("获取院内工作人员")
 | 
												
													
														
															|  |     public String getDoctorInHospital(@ApiParam(name = "doctor", value = "医生code") @RequestParam(required = true)String doctor,
 |  |     public String getDoctorInHospital(@ApiParam(name = "doctor", value = "医生code") @RequestParam(required = true)String doctor,
 | 
												
													
														
															|  |                                       @ApiParam(name = "name", value = "医生姓名模糊") @RequestParam(required = false)String name,
 |  |                                       @ApiParam(name = "name", value = "医生姓名模糊") @RequestParam(required = false)String name,
 | 
												
											
												
													
														
															|  | @ -181,5 +172,18 @@ public class SpecialistController extends BaseController {
 | 
												
													
														
															|  |         }
 |  |         }
 | 
												
													
														
															|  |     }
 |  |     }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  |     @RequestMapping(value = "getDoctorPatientByName", method = RequestMethod.GET)
 | 
												
													
														
															|  | 
 |  |     @ApiOperation("搜索专科医生下的居民")
 | 
												
													
														
															|  | 
 |  |     public String getDoctorPatientByName(@ApiParam(name = "doctor", value = "医生code") @RequestParam(required = true)String doctor,
 | 
												
													
														
															|  | 
 |  |                                          @ApiParam(name = "name", value = "居民姓名模糊") @RequestParam(required = false)String nameKey,
 | 
												
													
														
															|  | 
 |  |                                          @ApiParam(name = "page", value = "第几页,1开始") @RequestParam(required = true)Integer page,
 | 
												
													
														
															|  | 
 |  |                                          @ApiParam(name = "size", value = "每页大小") @RequestParam(required = true)Integer size) {
 | 
												
													
														
															|  | 
 |  |         try {
 | 
												
													
														
															|  | 
 |  |             return write(200, "获取成功", "data", specialistService.getDoctorPatientByName(doctor,nameKey,page,size));
 | 
												
													
														
															|  | 
 |  |         } catch (Exception e) {
 | 
												
													
														
															|  | 
 |  |             error(e);
 | 
												
													
														
															|  | 
 |  |             return error(-1, "请求失败");
 | 
												
													
														
															|  | 
 |  |         }
 | 
												
													
														
															|  | 
 |  |     }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | }
 |  | }
 |