Merge branch 'dev' of chenweida/patient-co-management into dev

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

@@ -5,6 +5,7 @@ import java.util.Map;
import com.yihu.wlyy.service.app.sign.FamilyContractService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -22,7 +23,7 @@ import com.yihu.wlyy.util.CommonUtil;
import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "/doctor/team",method = {RequestMethod.GET,RequestMethod.POST})
@RequestMapping(value = "/doctor/team")
@Api(description = "医生签约团队")
public class SignTeamController extends BaseController {
@@ -43,6 +44,7 @@ public class SignTeamController extends BaseController {
     */
    @RequestMapping(value = "teamListCount", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("查询医生所有的团队數目")
    public String teamListCount() {
        try {
            JSONObject json = new JSONObject();
@@ -63,6 +65,7 @@ public class SignTeamController extends BaseController {
     */
    @RequestMapping(value = "teamList", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("查询醫生所有的团队")
    public String teamList() {
        try {
            JSONObject json = new JSONObject();
@@ -82,8 +85,9 @@ public class SignTeamController extends BaseController {
     * @param team   行政团队标识
     * @return
     */
    @RequestMapping(value = "info")
    @RequestMapping(value = "info",method = {RequestMethod.POST,RequestMethod.GET})
    @ResponseBody
    @ApiOperation("查询指定医生的基本信息接口")
    public String info(@RequestParam(required = true, value = "doctor") String doctor,
                       @RequestParam(required = false, value = "team") String team) {
        try {
@@ -141,6 +145,7 @@ public class SignTeamController extends BaseController {
     */
    @RequestMapping(value = "doctors", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("查询团队中健康管理师或全科医生")
    public String getTeamDoctors(
            String type,
            Integer page,
@@ -165,6 +170,7 @@ public class SignTeamController extends BaseController {
     */
    @RequestMapping(value = "teamdoctors", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("查询医生团队中的某个类别医生")
    public String getTeamDoctorsByType(String type, Integer page,
                                       Integer pageSize) {
        try {
@@ -183,6 +189,7 @@ public class SignTeamController extends BaseController {
     */
    @RequestMapping(value = "teamDoctorsAndAdminTeamDoctors", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("求助页面需要的医生查找")
    public String getTeamDoctorsAndAdminTeamDoctors(Long teamId) {
        try {
            Map<String, List<Doctor>> doctors = drHealthTeamService.getTeamDoctorsAndAdminTeamDoctors("64de930c-5b15-11e6-8344-fa163e8aee56", teamId);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/template/DoctorGuidanceTempController.java

@@ -26,7 +26,7 @@ import java.util.Map;
 * Created by lyr on 2017/2/3.
 */
@RestController
@RequestMapping(value = "/doctor/guidance_temp",method = {RequestMethod.GET,RequestMethod.POST})
@RequestMapping(value = "/doctor/guidance_temp")
@Api(description = "医生健康指导模板")
public class DoctorGuidanceTempController extends BaseController {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/template/DoctorTeamGuidanceController.java

@@ -36,7 +36,7 @@ import java.util.*;
 * 医生端、后端团队指导模板控制类
 */
@Controller
@RequestMapping(value = "/doctor/team/guidance", produces = MediaType.APPLICATION_JSON_UTF8_VALUE,method = {RequestMethod.GET,RequestMethod.POST})
@RequestMapping(value = "/doctor/team/guidance", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "医生端&后端团队指导模板")
public class DoctorTeamGuidanceController extends WeixinBaseController {