提升swaggerUI加载速度

src/main/java/com/yihu/wlyy/task/PushMsgTask.java

@@ -10,8 +10,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -20,7 +22,7 @@ import com.yihu.wlyy.entity.wechat.WechatTemplateData;
import com.yihu.wlyy.util.HttpUtil;
@Controller
@RequestMapping(value = "/pushMsgTask")
@RequestMapping(value = "/pushMsgTask", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "消息推送")
public class PushMsgTask {

src/main/java/com/yihu/wlyy/web/common/FileUploadController.java

@@ -15,6 +15,7 @@ import javax.servlet.http.HttpServletResponse;
import io.swagger.annotations.Api;
import org.apache.commons.io.FileUtils;
import org.json.JSONObject;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.util.FileCopyUtils;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,7 +30,7 @@ import com.yihu.wlyy.util.SystemConf;
import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "/upload")
@RequestMapping(value = "/upload", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "文件上传")
public class FileUploadController extends BaseController {

src/main/java/com/yihu/wlyy/web/common/account/LoginController.java

@@ -21,8 +21,10 @@ import org.patchca.filter.predefined.*;
import org.patchca.service.ConfigurableCaptchaService;
import org.patchca.utils.encoder.EncoderHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -42,7 +44,7 @@ import java.util.List;
 * @author calvin
 */
@Controller
@RequestMapping(value = "/login")
@RequestMapping(value = "/login", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "患者、医生及管理员登录")
public class LoginController extends BaseController {

src/main/java/com/yihu/wlyy/web/common/account/WechatController.java

@@ -14,8 +14,10 @@ import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.yihu.wlyy.entity.patient.Patient;
@@ -32,7 +34,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
 * @author calvin
 */
@Controller
@RequestMapping(value = "/weixin")
@RequestMapping(value = "/weixin", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "微信端用户注册")
public class WechatController extends WeixinBaseController {

src/main/java/com/yihu/wlyy/web/common/advert/AdvertController.java

@@ -2,15 +2,17 @@ package com.yihu.wlyy.web.common.advert;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.yihu.wlyy.service.common.advert.AdvertService;
import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "common")
@RequestMapping(value = "common", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "广告")
public class AdvertController extends BaseController {
	

src/main/java/com/yihu/wlyy/web/common/data/DataController.java

@@ -6,15 +6,17 @@ import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.yihu.wlyy.entity.dict.Disease;
import com.yihu.wlyy.service.common.data.DataService;
import com.yihu.wlyy.web.BaseController;
@RequestMapping(value = "/common/data")
@RequestMapping(value = "/common/data", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Controller
@Api(description = "疾病与社区")
public class DataController extends BaseController {

src/main/java/com/yihu/wlyy/web/common/device/DeviceController.java

@@ -8,12 +8,13 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping(value = "/common/device")
@RequestMapping(value = "/common/device", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "设备管理")
public class DeviceController extends BaseController {
	

src/main/java/com/yihu/wlyy/web/common/district/DistrictController.java

@@ -4,8 +4,10 @@ import java.util.List;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.yihu.wlyy.service.common.district.DistrictService;
@@ -17,7 +19,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "common")
@RequestMapping(value = "common", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "省市区三级地址")
public class DistrictController extends BaseController {

src/main/java/com/yihu/wlyy/web/common/im/imController.java

@@ -3,14 +3,16 @@ package com.yihu.wlyy.web.common.im;
import io.swagger.annotations.Api;
import org.json.JSONObject;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import com.yihu.wlyy.util.HttpUtil;
import com.yihu.wlyy.web.BaseController;
@RestController
@RequestMapping(value = "common")
@RequestMapping(value = "common", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "IM-即时消息")
public class imController extends BaseController {
	

src/main/java/com/yihu/wlyy/web/common/qrcode/QrCodeController.java

@@ -7,8 +7,10 @@ import com.yihu.wlyy.web.WeixinBaseController;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletResponse;
@@ -21,7 +23,7 @@ import java.io.OutputStream;
 * Created by lyr on 2016/08/10.
 */
@Controller
@RequestMapping(value = "/qrcode")
@RequestMapping(value = "/qrcode", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "二维码")
public class QrCodeController extends WeixinBaseController {

src/main/java/com/yihu/wlyy/web/common/system/SystemDictController.java

@@ -7,8 +7,10 @@ import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
@@ -18,7 +20,7 @@ import java.util.List;
 */
@Controller
@RequestMapping(value = "/common")
@RequestMapping(value = "/common", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "系统字典")
public class SystemDictController extends BaseController {
    @Autowired

src/main/java/com/yihu/wlyy/web/common/util/ManagerUtilController.java

@@ -10,7 +10,9 @@ import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.hash.HashMapper;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat;
@@ -21,7 +23,7 @@ import java.util.HashMap;
 * Created by lyr on 2016/09/13.
 */
@RestController
@RequestMapping(value = "/manage_util")
@RequestMapping(value = "/manage_util", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "管理工具及后台任务控制")
public class ManagerUtilController extends BaseController {

src/main/java/com/yihu/wlyy/web/common/version/VersionController.java

@@ -3,8 +3,10 @@ package com.yihu.wlyy.web.common.version;
import io.swagger.annotations.Api;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.yihu.wlyy.entity.Versions;
@@ -17,7 +19,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/version")
@RequestMapping(value = "/version", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "版本")
public class VersionController extends BaseController {

src/main/java/com/yihu/wlyy/web/data/DataHandlingController.java

@@ -8,8 +8,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -18,7 +20,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 * 修改历史数据处理控制器
 */
@Controller
@RequestMapping(value = "/dataHandling")
@RequestMapping(value = "/dataHandling", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
public class DataHandlingController extends BaseController {
    @Autowired

src/main/java/com/yihu/wlyy/web/doctor/account/DoctorController.java

@@ -23,8 +23,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springside.modules.utils.Encodes;
@@ -45,7 +47,7 @@ import com.yihu.wlyy.repository.patient.SocialSecurityInfoDao;
 * @author calvin
 */
@Controller
@RequestMapping(value = "/doctor")
@RequestMapping(value = "/doctor", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "医生")
public class DoctorController extends BaseController {

src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorConsultController.java

@@ -12,8 +12,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -35,7 +37,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
 *
 */
@Controller
@RequestMapping(value = "/doctor/consult")
@RequestMapping(value = "/doctor/consult", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "三师咨询")
public class DoctorConsultController extends WeixinBaseController {

src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorConsultMoviController.java

@@ -8,8 +8,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.yihu.wlyy.entity.consult.ConsultMoVi;
@@ -26,7 +28,7 @@ import com.yihu.wlyy.web.BaseController;
 * @author George
 */
@Controller
@RequestMapping(value = "/doctor/consult")
@RequestMapping(value = "/doctor/consult", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "电话咨询")
public class DoctorConsultMoviController extends BaseController {

src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorConsultPublicController.java

@@ -10,8 +10,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -30,7 +32,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/doctor/consult/public")
@RequestMapping(value = "/doctor/consult/public", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "公共咨询")
public class DoctorConsultPublicController extends BaseController {

src/main/java/com/yihu/wlyy/web/doctor/device/DoctorDeviceController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -25,7 +26,7 @@ import java.util.Map;
 *
 */
@Controller
@RequestMapping(value = "doctor/device")
@RequestMapping(value = "doctor/device", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(value = "患者设备管理--医生端", description = "患者设备管理--医生端")
public class DoctorDeviceController extends BaseController {

src/main/java/com/yihu/wlyy/web/doctor/discussion/DoctorDiscussionGroupController.java

@@ -12,8 +12,10 @@ import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -22,7 +24,7 @@ import com.yihu.wlyy.service.common.account.DoctorService;
import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "/doctor/talkgroup")
@RequestMapping(value = "/doctor/talkgroup", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "医生端-讨论组")
public class DoctorDiscussionGroupController extends BaseController {
	// 医生服务类

src/main/java/com/yihu/wlyy/web/doctor/family/DoctorFamilyController.java

@@ -5,15 +5,17 @@ import com.yihu.wlyy.web.WeixinBaseController;
import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
/**
 * Created by Administrator on 2016.08.20.
 */
@Controller
@RequestMapping("/doctor/family")
@RequestMapping(value = "/doctor/family", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "医生端-家庭查询")
public class DoctorFamilyController extends WeixinBaseController{
    @Autowired

src/main/java/com/yihu/wlyy/web/doctor/followup/DoctorFollowUpController.java

@@ -10,8 +10,10 @@ import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -34,7 +36,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/doctor/followup")
@RequestMapping(value = "/doctor/followup", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "医生端-随访干预")
public class DoctorFollowUpController extends BaseController {

src/main/java/com/yihu/wlyy/web/doctor/followup/DoctorFollowUpControllerGeorge.java

@@ -10,8 +10,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -35,7 +37,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/doctor/followup")
@RequestMapping(value = "/doctor/followup", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "随访干预")
public class DoctorFollowUpControllerGeorge extends BaseController {

src/main/java/com/yihu/wlyy/web/doctor/followup/DoctorFollowUpPlanRemindController.java

@@ -2,8 +2,10 @@ package com.yihu.wlyy.web.doctor.followup;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.yihu.wlyy.entity.follow.FollowUpPlanRemind;
@@ -18,7 +20,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/doctor/followup/remind")
@RequestMapping(value = "/doctor/followup/remind", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "随访提醒")
public class DoctorFollowUpPlanRemindController extends BaseController {

src/main/java/com/yihu/wlyy/web/doctor/health/DoctorHealthController.java

@@ -13,6 +13,7 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -25,7 +26,7 @@ import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "/doctor/health_index")
@RequestMapping(value = "/doctor/health_index", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "医生端-患者指标")
public class DoctorHealthController extends BaseController {

src/main/java/com/yihu/wlyy/web/doctor/health/DoctorHealthEduArticleController.java

@@ -12,8 +12,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
@@ -32,7 +34,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/doctor/health/edu")
@RequestMapping(value = "/doctor/health/edu", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "健康教育")
public class DoctorHealthEduArticleController extends BaseController {

src/main/java/com/yihu/wlyy/web/doctor/health/DoctorHealthGuidanceController.java

@@ -4,8 +4,10 @@ import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -20,7 +22,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
 *
 */
@Controller
@RequestMapping(value = "/doctor/health/guidance")
@RequestMapping(value = "/doctor/health/guidance", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "健康指导")
public class DoctorHealthGuidanceController extends WeixinBaseController {

src/main/java/com/yihu/wlyy/web/doctor/health/DoctorHealthRecordController.java

@@ -5,8 +5,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.yihu.wlyy.entity.patient.PatientHealthRecordDiet;
@@ -22,7 +24,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/doctor/health_record")
@RequestMapping(value = "/doctor/health_record", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "健康记录")
public class DoctorHealthRecordController extends BaseController {

src/main/java/com/yihu/wlyy/web/doctor/intervene/DoctorInterveneController.java

@@ -10,8 +10,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -34,7 +36,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/doctor/intervene")
@RequestMapping(value = "/doctor/intervene", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "医生端-预防与干预")
public class DoctorInterveneController extends BaseController {

src/main/java/com/yihu/wlyy/web/doctor/medical/DoctorMedicalRecordController.java

@@ -9,8 +9,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.yihu.wlyy.entity.consult.Consult;
@@ -31,7 +33,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/doctor/medical/record")
@RequestMapping(value = "/doctor/medical/record", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "医生端-病历夹")
public class DoctorMedicalRecordController extends BaseController {

src/main/java/com/yihu/wlyy/web/doctor/message/DoctorMessageController.java

@@ -6,8 +6,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -17,7 +19,7 @@ import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "/doctor/message")
@RequestMapping(value = "/doctor/message", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "医生端-消息")
public class DoctorMessageController extends BaseController {

src/main/java/com/yihu/wlyy/web/doctor/patient/DoctorPatientGroupController.java

@@ -16,9 +16,11 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.http.MediaType;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.yihu.wlyy.service.app.account.DoctorInfoService;
@@ -35,7 +37,7 @@ import com.yihu.wlyy.web.BaseController;
 * @author George
 */
@Controller
@RequestMapping(value = "/doctor/patient_group")
@RequestMapping(value = "/doctor/patient_group", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "医生端-患者分组管理")
public class DoctorPatientGroupController extends BaseController {

src/main/java/com/yihu/wlyy/web/doctor/patient/PatientDiseaseController.java

@@ -9,8 +9,10 @@ import org.bouncycastle.jce.provider.symmetric.ARC4;
import org.json.JSONArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.Arrays;
@@ -22,7 +24,7 @@ import java.util.List;
 * Created by lyr on 2016/09/09.
 */
@RestController
@RequestMapping(value = "/doctor/patient")
@RequestMapping(value = "/doctor/patient", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "患者疾病")
public class PatientDiseaseController extends BaseController {

src/main/java/com/yihu/wlyy/web/doctor/scheduling/DoctorWorkTimeController.java

@@ -8,8 +8,10 @@ import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
@@ -17,7 +19,7 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 * Created by lyr on 2016/08/19.
 */
@Controller
@RequestMapping(value = "/doctor/work_scheduling")
@RequestMapping(value = "/doctor/work_scheduling", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "医生端-排班时间")
public class DoctorWorkTimeController extends BaseController {

src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorFamilyContractController.java

@@ -16,8 +16,10 @@ import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -35,7 +37,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
 * @author George
 */
@Controller
@RequestMapping(value = "/doctor/family_contract")
@RequestMapping(value = "/doctor/family_contract", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "医生端-家庭签约")
public class DoctorFamilyContractController extends WeixinBaseController {

src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorSignController.java

@@ -10,10 +10,8 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.service.app.account.DoctorInfoService;
@@ -30,7 +28,7 @@ import com.yihu.wlyy.web.BaseController;
 */
@RestController
@RequestMapping(value = "/doctor/sign")
@RequestMapping(value = "/doctor/sign", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "医生端-签约管理")
public class DoctorSignController extends BaseController {

src/main/java/com/yihu/wlyy/web/manager/IndexController.java

@@ -1,15 +1,14 @@
package com.yihu.wlyy.web.manager;
import io.swagger.annotations.Api;
import com.yihu.wlyy.web.BaseController;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import com.yihu.wlyy.web.BaseController;
import springfox.documentation.annotations.ApiIgnore;
@Controller
@RequestMapping(value = "/index")
@Api(description = "主页-非API")
@ApiIgnore
public class IndexController extends BaseController {
	
	@RequestMapping(method = RequestMethod.GET)

src/main/java/com/yihu/wlyy/web/patient/account/PatientController.java

@@ -17,8 +17,10 @@ import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springside.modules.utils.Encodes;
@@ -31,7 +33,7 @@ import java.util.List;
 * @author George
 */
@Controller
@RequestMapping(value = "/patient")
@RequestMapping(value = "/patient", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "患者管理")
public class PatientController extends WeixinBaseController {

src/main/java/com/yihu/wlyy/web/patient/consult/ConsultCommunicationController.java

@@ -9,8 +9,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -25,7 +27,7 @@ import com.yihu.wlyy.util.MyStringUtil;
import com.yihu.wlyy.web.WeixinBaseController;
@Controller
@RequestMapping(value = "/patient/consult/communication")
@RequestMapping(value = "/patient/consult/communication", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者端-病友圈")
public class ConsultCommunicationController extends WeixinBaseController {
@@ -41,7 +43,7 @@ public class ConsultCommunicationController extends WeixinBaseController {
	 * @param diseaseName 疾病
	 * @return
	 */
	@RequestMapping(value = "add")
	@RequestMapping(value = "add", method = RequestMethod.GET)
	@ResponseBody
	public String add(String question, String content, @RequestParam(required = false) String images, @RequestParam(required = false) String disease, @RequestParam(required = false) String diseaseName) {
		try {
@@ -87,7 +89,7 @@ public class ConsultCommunicationController extends WeixinBaseController {
	 * @param pagesize 分页大小
	 * @return
	 */
	@RequestMapping(value = "list")
	@RequestMapping(value = "list", method = RequestMethod.GET)
	@ResponseBody
	public String list(int type, @RequestParam(required = false) String disease, long id, int pagesize) {
		try {
@@ -137,7 +139,7 @@ public class ConsultCommunicationController extends WeixinBaseController {
	 * @param images 回复图片，多图以逗号分隔
	 * @return
	 */
	@RequestMapping(value = "reply")
	@RequestMapping(value = "reply", method = RequestMethod.GET)
	@ResponseBody
	public String reply(String consult, String content, @RequestParam(required = false) String images) {
		try {
@@ -173,7 +175,7 @@ public class ConsultCommunicationController extends WeixinBaseController {
	 * @param pagesize 分页大小
	 * @return
	 */
	@RequestMapping(value = "reply_list")
	@RequestMapping(value = "reply_list", method = RequestMethod.GET)
	@ResponseBody
	public String replyList(String consult, long id, int pagesize) {
		try {
@@ -221,7 +223,7 @@ public class ConsultCommunicationController extends WeixinBaseController {
	 * @param consult
	 * @return
	 */
	@RequestMapping(value = "info")
	@RequestMapping(value = "info", method = RequestMethod.GET)
	@ResponseBody
	public String info(String consult) {
		try {

src/main/java/com/yihu/wlyy/web/patient/consult/ConsultController.java

@@ -14,8 +14,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -37,7 +39,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
 *
 */
@Controller
@RequestMapping(value = "/patient/consult")
@RequestMapping(value = "/patient/consult", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者端-患者咨询")
public class ConsultController extends WeixinBaseController {
@@ -61,7 +63,7 @@ public class ConsultController extends WeixinBaseController {
	 * @param pagesize 分页大小
	 * @return
	 */
	@RequestMapping(value = "records")
	@RequestMapping(value = "records", method = RequestMethod.GET)
	@ResponseBody
	public String consultRecords(
			@RequestParam(required = false) String  title,
@@ -107,7 +109,7 @@ public class ConsultController extends WeixinBaseController {
	 * @param week
	 * @return
	 */
	@RequestMapping(value = "/doctor_worktime/week")
	@RequestMapping(value = "/doctor_worktime/week", method = RequestMethod.GET)
	@ResponseBody
	public String getDoctorWeekWorkTime(String doctor,String week){
		try{
@@ -126,7 +128,7 @@ public class ConsultController extends WeixinBaseController {
	 * @param doctor
	 * @return
	 */
	@RequestMapping(value = "/doctor_worktime")
	@RequestMapping(value = "/doctor_worktime", method = RequestMethod.GET)
	@ResponseBody
	public String getDoctorWorkTime(String doctor){
		try{
@@ -145,7 +147,7 @@ public class ConsultController extends WeixinBaseController {
     * @param doctor
     * @return
     */
    @RequestMapping(value = "is_doctor_working")
    @RequestMapping(value = "is_doctor_working", method = RequestMethod.GET)
    @ResponseBody
	public String isDoctorAtWorking(String doctor){
		try{
@@ -163,7 +165,7 @@ public class ConsultController extends WeixinBaseController {
	 * @param doctor
	 * @return
	 */
	@RequestMapping(value = "is_famous_doctor_working")
	@RequestMapping(value = "is_famous_doctor_working", method = RequestMethod.GET)
	@ResponseBody
	public String isFamousDoctorAtWorking(String doctor){
		try{
@@ -181,7 +183,7 @@ public class ConsultController extends WeixinBaseController {
	 * @param doctor
	 * @return
	 */
	@RequestMapping(value = "/consult_times_remain")
	@RequestMapping(value = "/consult_times_remain", method = RequestMethod.GET)
	@ResponseBody
	public String famousDoctorTimesRemain(String doctor){
		try{
@@ -198,7 +200,7 @@ public class ConsultController extends WeixinBaseController {
	 *
	 * @return
	 */
	@RequestMapping(value = "/unfinished")
	@RequestMapping(value = "/unfinished", method = RequestMethod.GET)
	@ResponseBody
	public String getUnFinishedConsult(){
		try{
@@ -220,7 +222,7 @@ public class ConsultController extends WeixinBaseController {
	 * @param voice 语音URL地址
	 * @return
	 */
	@RequestMapping(value = "add")
	@RequestMapping(value = "add", method = RequestMethod.GET)
	@ResponseBody
	public String add(@RequestParam(required = false) Integer type,
					  String when,
@@ -297,7 +299,7 @@ public class ConsultController extends WeixinBaseController {
	 * @param doctorCode 名医的code
	 * @return
	 */
	@RequestMapping(value = "famousAdd")
	@RequestMapping(value = "famousAdd", method = RequestMethod.GET)
	@ResponseBody
	public String famousAdd(
					  @RequestParam(required = false)String when,
@@ -362,7 +364,7 @@ public class ConsultController extends WeixinBaseController {
	 * 名医列表
	 * @return
     */
	@RequestMapping(value = "famousDoctorList")
	@RequestMapping(value = "famousDoctorList", method = RequestMethod.GET)
	@ResponseBody
	public String famousDoctorList(
									@RequestParam(required = false) String name,
@@ -420,7 +422,7 @@ public class ConsultController extends WeixinBaseController {
		}
	}
	@RequestMapping(value = "status")
	@RequestMapping(value = "status", method = RequestMethod.GET)
	@ResponseBody
	public String status(String consult) {
		try {
@@ -442,7 +444,7 @@ public class ConsultController extends WeixinBaseController {
	 * @param pagesize 页数
	 * @return 查询结果
	 */
	@RequestMapping(value = "list")
	@RequestMapping(value = "list", method = RequestMethod.GET)
	@ResponseBody
	public String list(int status, long id, int pagesize) {
		try {
@@ -486,7 +488,7 @@ public class ConsultController extends WeixinBaseController {
	 * @param consult
	 * @return
	 */
	@RequestMapping(value = "cancel")
	@RequestMapping(value = "cancel", method = RequestMethod.GET)
	@ResponseBody
	public String cancel(String consult) {
		try {
@@ -507,7 +509,7 @@ public class ConsultController extends WeixinBaseController {
	 * @param code 咨询标识
	 * @return
	 */
	@RequestMapping(value = "finish")
	@RequestMapping(value = "finish", method = RequestMethod.GET)
	@ResponseBody
	public String finish(String code) {
		try {
@@ -530,7 +532,7 @@ public class ConsultController extends WeixinBaseController {
	 * @param type 追问内容类型：1文字，2图片，3语音
	 * @return
	 */
	@RequestMapping(value = "append")
	@RequestMapping(value = "append", method = RequestMethod.GET)
	@ResponseBody
	public String append(String consult, String content, int type) {
		try {
@@ -580,7 +582,7 @@ public class ConsultController extends WeixinBaseController {
	 * @param pagesize 每页显示数，默认为10
	 * @return
	 */
	@RequestMapping(value = "loglist")
	@RequestMapping(value = "loglist", method = RequestMethod.GET)
	@ResponseBody
	public String loglist(String consult, long id, int pagesize) {
		try {
@@ -630,7 +632,7 @@ public class ConsultController extends WeixinBaseController {
	 *
	 * @return
	 */
	@RequestMapping(value = "oneLog")
	@RequestMapping(value = "oneLog", method = RequestMethod.GET)
	@ResponseBody
	public String oneLog(String consult,Long logId) {
		try {
@@ -669,7 +671,7 @@ public class ConsultController extends WeixinBaseController {
	 * @param star 星级
	 * @return 操作结果
	 */
	@RequestMapping(value = "comment")
	@RequestMapping(value = "comment", method = RequestMethod.GET)
	@ResponseBody
	public String comment(String consult, String content, int star) {
		try {

src/main/java/com/yihu/wlyy/web/patient/consult/ConsultMoviController.java

@@ -1,11 +1,13 @@
package com.yihu.wlyy.web.patient.consult;
import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -23,6 +25,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
 */
@Controller
@RequestMapping(value = "/patient/consult_movi")
@Api(description = "视频咨询")
public class ConsultMoviController extends WeixinBaseController {
	@Autowired
@@ -34,51 +37,11 @@ public class ConsultMoviController extends WeixinBaseController {
	 * 视频咨询三师医生查询接口
	 * @return
	 */
	@RequestMapping(value = "doctors")
	@RequestMapping(value = "doctors", method = RequestMethod.GET)
	@ResponseBody
	public String doctors() {
		try {
//			// 查询签约信息
//			SignContract signContract = signContractService.findByPatient(getUID());
//			if (signContract == null) {
//				return error(-1, "查询失败，签约信息无效或已过期！");
//			}
//			// 查询三师医生信息
//			List<Object> doctors = doctorTeamService.findDoctorsInTeam(signContract.getTeam());
			JSONArray jsonArray = new JSONArray();
//			if (doctors != null) {
//				for (Object obj : doctors) {
//					Object[] temp = (Object[]) obj;
//					if (temp == null || temp.length != 8) {
//						continue;
//					}
//					JSONObject json = new JSONObject();
//					// 设置医生标识
//					json.put("code", temp[0]);
//					// 设置医生姓名
//					json.put("name", temp[1]);
//					// 设置医生头像
//					json.put("photo", CommonUtil.getPhoneUrl((String) temp[2]));
//					// 设置医生所在医院
//					json.put("hospitalName", temp[3]);
//					// 设置医生科室
//					json.put("deptName", temp[4]);
//					// 设置医生专长
//					json.put("expertise", temp[6]);
//					// 设置医生类型
//					int type = (Integer) temp[7];
//					if (type == 1) {
//						json.put("typename", "专科医生");
//					} else if (type == 2) {
//						json.put("typename", "全科医生");
//					} else if (type == 3) {
//						json.put("typename", "健康管理师");
//					} else {
//						json.put("typename", "");
//					}
//					jsonArray.put(json);
//				}
//			}
			return write(200, "查询成功！", "list", jsonArray);
		} catch (Exception e) {
			error(e);
@@ -101,105 +64,10 @@ public class ConsultMoviController extends WeixinBaseController {
	 * @param imageUrls 图片URL，多图逗号分隔
	 * @return
	 */
	@RequestMapping(value = "add")
	@RequestMapping(value = "add", method = RequestMethod.GET)
	@ResponseBody
	public String add(@RequestParam(required = false) Integer target, @RequestParam(required = false) Integer type, @RequestParam(required = false) String family, @RequestParam(required = false) String doctor, String scheduling, String appo_date, int appo_week, String hour_begin, String hour_end, String content, @RequestParam(required = false) String images) {
		try {
//			Patient patient = patientInfoService.findByCode(getUID());
//			// 默认为三师预约
//			if (target == null || target == 0) {
//				target = 2;
//			}
//			// 默认为视频咨询
//			if (type == null || type == 0) {
//				type = 2;
//			}
//			ConsultMoVi movi = new ConsultMoVi();
//			movi.setTarget(target);
//			movi.setType(type);
//			// 指定医生咨询
//			if (target == 1 && StringUtils.isNotEmpty(doctor)) {
//				// 查询医生信息
//				Doctor d = doctorService.findDoctorByCode(doctor);
//				movi.setDoctor(d.getCode());
//				movi.setDoctorName(d.getName());
//			}
//			// 查询三师团队标识
//			if (target == 2) {
//				SignContract sc = doctorTeamService.findBySignContractUser(getUID());
//				if (sc == null) {
//					return error(-1, "三师签约信息不存在或已过期，无法进行三师咨询！");
//				}
//				DoctorTeam team = doctorTeamService.findByCode(sc.getTeam());
//				movi.setTeam(team.getCode());
//				movi.setTeamName(team.getName());
//			}
//			// 设置家人标识
//			if (StringUtils.isNoneEmpty(family)) {
//				movi.setFamily(family);
//			}
//			// 设置备注
//			movi.setContent(content);
//			// 设置预约患者
//			movi.setPatient(patient.getCode());
//			movi.setName(patient.getName());
//			movi.setSex(patient.getSex());
//			movi.setBirthday(patient.getBirthday());
//			movi.setPhoto(patient.getPhoto());
//			// 设置排班标识
//			movi.setScheduling(scheduling);
//			// 设置预约日期
//			movi.setAppoDate(DateUtil.strToDateAppendNowTime(appo_date, DateUtil.YYYY_MM_DD_HH_MM_SS));
//			// 设置预约星期
//			movi.setAppoWeek(appo_week);
//			// 设置预约时段
//			movi.setHourBegin(Time.valueOf(hour_begin));
//			movi.setHourEnd(Time.valueOf(hour_end));
//			// 设置图片
//			if(StringUtils.isEmpty(images)){
//				images = fetchWxImages();
//			}
//			if(StringUtils.isNotEmpty(images)){
//				images = CommonUtil.copyTempImage(images);
//			}
//			movi.setImages(images);
//			movi.setStatus(0);
//			// 默认转诊给健康管理师
//			ConsultMoViReferral cmr = null;
//			if (target == 2) {
//				cmr = new ConsultMoViReferral();
//				cmr.setCzrq(new Date());
//				cmr.setFlag(0);
//				if (target == 2 && StringUtils.isNotEmpty(doctor)) {
//					// 已指定医生
//					cmr.setTo(doctor);
//				} else {
//					// 未指定医生，查询患者所在三师团队的健康管理师
//					cmr.setTo(doctorTeamService.findHealthDoctorByTeam(movi.getTeam()));
//				}
//				// 设置排班标识
//				cmr.setScheduling(scheduling);
//				// 设置预约日期
//				cmr.setAppoDate(DateUtil.strToDate(appo_date, DateUtil.YYYY_MM_DD));
//				// 设置预约星期
//				cmr.setAppoWeek(appo_week);
//				// 设置预约时段
//				cmr.setHourBegin(Time.valueOf(hour_begin));
//				cmr.setHourEnd(Time.valueOf(hour_end));
//			}
//			// 保存预约信息
//			ConsultMoVi temp = consultMoviService.addMoVi(movi, cmr);
//			if (temp != null) {
//				// 添加到统计队列
//				if (target == 2) {
//					DoctorStatisticsTask.getInstance(doctorStatisticsService).put(temp.getDoctor(), 1, 2, 0);
//				}
//				// 推送消息给医生
//				PushMsgTask.getInstance().put(movi.getDoctor(), MessageType.MESSAGE_TYPE_DOCTOR_CONSULT_VIDEO.D_CV_01.name(), MessageType.MESSAGE_TYPE_DOCTOR_CONSULT_VIDEO.视频咨询.name(), MessageType.MESSAGE_TYPE_DOCTOR_CONSULT_VIDEO.您有新的视频咨询.name(), temp.getConsult());
//				return success("预约成功！");
//			} else {
//				return error(-1, "预约失败！");
//			}
			return success("预约成功！");
		} catch (Exception e) {
			error(e);
@@ -207,58 +75,6 @@ public class ConsultMoviController extends WeixinBaseController {
		}
	}
//	/**
//	 * 电话视频咨询列表查询
//	 * @param page 查询页码，默认为1
//	 * @param pagesize 每页显示数，默认为10
//	 * @return
//	 */
//	@RequestMapping(value = "list")
//	@ResponseBody
//	public String list(String appoDate, int pagesize) {
//		try {
//			Page<ConsultMoVi> list = consultMoviService.findByPatient(getUID(), DateUtil.strToDateLong(appoDate), pagesize);
//			if (list != null) {
//				JSONArray jsonArray = new JSONArray();
//				for (ConsultMoVi consult : list) {
//					if (consult == null) {
//						continue;
//					}
//					JSONObject json = new JSONObject();
//					json.put("id", consult.getId());
//					// 设置咨询标识
//					json.put("code", consult.getConsult());
//					// 咨询类型，1电话咨询，2视频咨询
//					// json.put("type", consult.getType());
//					// 预约类型：1指定医生，2三师预约
//					// json.put("target", consult.getTarget());
//					// 医生姓名（暂时没有指定医生咨询）
//					// json.put("doctor", consult.getDoctor().getName());
//					// 三师团队名称
//					json.put("team", consult.getTeamName());
//					// 预约时间
//					json.put("date", DateUtil.dateToStrLong(consult.getAppoDate()));
//					// 预约星期
//					json.put("week", consult.getAppoWeek());
//					// 预约时间段
//					json.put("begin", DateUtil.dateToStr(consult.getHourBegin(), DateUtil.HH_MM));
//					json.put("end", DateUtil.dateToStr(consult.getHourEnd(), DateUtil.HH_MM));
//					// 咨询状态：0待医生同意，-1医生拒绝，1医生同意，2咨询完成
//					json.put("status", consult.getStatus());
//					// 设置评价标识，未空表示未评价
//					json.put("comment", consult.getComment());
//					jsonArray.put(json);
//				}
//				return write(200, "查询成功", list.isFirst(), list.isLast(), list.getTotalElements(), list.getTotalPages(), "list", jsonArray);
//			} else {
//				return success("查询成功");
//			}
//		} catch (Exception e) {
//			error(e);
//			return error(-1, "查询失败！");
//		}
//	}
	/**
	 * 视频咨询评论
	 * @param consult 视频咨询标识
@@ -266,7 +82,7 @@ public class ConsultMoviController extends WeixinBaseController {
	 * @param star 星级
	 * @return 操作结果
	 */
	@RequestMapping(value = "comment")
	@RequestMapping(value = "comment", method = RequestMethod.GET)
	@ResponseBody
	public String comment(String consult, String content, int star) {
		try {
@@ -290,7 +106,5 @@ public class ConsultMoviController extends WeixinBaseController {
			error(e);
			return invalidUserException(e, -1, "评价失败！");
		}
	}
}

src/main/java/com/yihu/wlyy/web/patient/consult/ConsultPublicController.java

@@ -10,8 +10,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -29,7 +31,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
 *
 */
@Controller
@RequestMapping(value = "/patient/consult/public")
@RequestMapping(value = "/patient/consult/public", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "图文咨询,公共咨询,病友圈")
public class ConsultPublicController extends WeixinBaseController {
@@ -51,7 +53,7 @@ public class ConsultPublicController extends WeixinBaseController {
	 * @param diseaseName 疾病类型名称
	 * @return
	 */
	@RequestMapping(value = "add")
	@RequestMapping(value = "add", method = RequestMethod.GET)
	@ResponseBody
	public String add(
			String question,
@@ -106,7 +108,7 @@ public class ConsultPublicController extends WeixinBaseController {
	 * @param pagesize 分页大小
	 * @return
	 */
	@RequestMapping(value = "list")
	@RequestMapping(value = "list", method = RequestMethod.GET)
	@ResponseBody
	public String list(long id, int pagesize, @RequestParam(required = false) String disease) {
		try {
@@ -161,7 +163,7 @@ public class ConsultPublicController extends WeixinBaseController {
	 * @param images 回复图片，多图以逗号分隔
	 * @return
	 */
	@RequestMapping(value = "reply")
	@RequestMapping(value = "reply", method = RequestMethod.GET)
	@ResponseBody
	public String reply(String consult, String content, @RequestParam(required = false) String images) {
		try {
@@ -201,7 +203,7 @@ public class ConsultPublicController extends WeixinBaseController {
	 *            分页大小
	 * @return
	 */
	@RequestMapping(value = "reply_list")
	@RequestMapping(value = "reply_list", method = RequestMethod.GET)
	@ResponseBody
	public String replyList(String consult, long id, int pagesize) {
		try {
@@ -248,7 +250,7 @@ public class ConsultPublicController extends WeixinBaseController {
	 * @param consult
	 * @return
	 */
	@RequestMapping(value = "info")
	@RequestMapping(value = "info", method = RequestMethod.GET)
	@ResponseBody
	public String info(String consult) {
		try {

src/main/java/com/yihu/wlyy/web/patient/family/PatientFamilyController.java

@@ -5,15 +5,17 @@ import com.yihu.wlyy.service.app.family.FamilyService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
/**
 * Created by Administrator on 2016.08.20.
 */
@Controller
@RequestMapping("/patient/family")
@RequestMapping(value = "/patient/family", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "患者家庭")
public class PatientFamilyController extends BaseController {
    @Autowired

src/main/java/com/yihu/wlyy/web/patient/followup/PatientFollowUpController.java

@@ -8,8 +8,10 @@ import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -31,7 +33,7 @@ import com.yihu.wlyy.web.patient.followup.vo.FollowupPlanVO;
 * 
 */
@Controller
@RequestMapping(value = "/patient/followup")
@RequestMapping(value = "/patient/followup", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "患者端-随访干预")
public class PatientFollowUpController extends BaseController {
	@Autowired
@@ -41,8 +43,7 @@ public class PatientFollowUpController extends BaseController {
	 * 
	 * @param pagesize
	 *            每页显示条数   /patient/followup/followupPlanList
	 * @param pagenum
	 *            当前页
	 * @param pagenum 当前页
	 * @return
	 */
	@RequestMapping(value = "followupPlanList")

src/main/java/com/yihu/wlyy/web/patient/health/HealthEduArticleController.java

@@ -5,8 +5,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.yihu.wlyy.entity.education.HealthEduArticlePatient;
@@ -20,7 +22,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/patient/health/edu")
@RequestMapping(value = "/patient/health/edu", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "患者端-健康教育")
public class HealthEduArticleController extends BaseController {

src/main/java/com/yihu/wlyy/web/patient/health/HealthNewsController.java

@@ -5,8 +5,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.yihu.wlyy.entity.education.HealthNews;
@@ -20,7 +22,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/patient/health/news")
@RequestMapping(value = "/patient/health/news", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "患者端-健康资讯")
public class HealthNewsController extends BaseController {

src/main/java/com/yihu/wlyy/web/patient/health/PatientHealthController.java

@@ -12,6 +12,7 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -24,7 +25,7 @@ import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "/patient/health_index")
@RequestMapping(value = "/patient/health_index", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "患者指标")
public class PatientHealthController extends BaseController {

src/main/java/com/yihu/wlyy/web/patient/health/PatientHealthGuidanceController.java

@@ -3,8 +3,10 @@ package com.yihu.wlyy.web.patient.health;
import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.yihu.wlyy.service.app.health.PatientHealthGuidanceService;
@@ -16,7 +18,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/patient/health/guidance")
@RequestMapping(value = "/patient/health/guidance", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "患者端-健康指导")
public class PatientHealthGuidanceController extends BaseController {

src/main/java/com/yihu/wlyy/web/patient/health/PatientHealthRecordController.java

@@ -9,8 +9,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -33,7 +35,7 @@ import com.yihu.wlyy.web.WeixinBaseController;
 *
 */
@Controller
@RequestMapping(value = "/patient/health_record")
@RequestMapping(value = "/patient/health_record", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "患者端-健康记录")
public class PatientHealthRecordController extends WeixinBaseController {

src/main/java/com/yihu/wlyy/web/patient/hosptail/HospitalController.java

@@ -11,8 +11,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -22,7 +24,7 @@ import java.util.List;
 * Created by Administrator on 2016.08.19.
 */
@Controller
@RequestMapping(value = "/patient/hosptail")
@RequestMapping(value = "/patient/hosptail", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "医院查询")
public class HospitalController extends BaseController {
    @Autowired

src/main/java/com/yihu/wlyy/web/patient/hosptail/HospitalWithoutFilterController.java

@@ -8,8 +8,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -17,7 +19,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 * Created by Administrator on 2016.08.19.
 */
@Controller
@RequestMapping(value = "/hosptail")
@RequestMapping(value = "/hosptail", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "医院查询-无过滤")
public class HospitalWithoutFilterController extends BaseController {
    @Autowired

src/main/java/com/yihu/wlyy/web/patient/intervene/PatientInterveneController.java

@@ -7,8 +7,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.yihu.wlyy.entity.patient.PatientInspectionSuggest;
@@ -24,7 +26,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/patient/intervene")
@RequestMapping(value = "/patient/intervene", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "患者端-干预控制")
public class PatientInterveneController extends BaseController {

src/main/java/com/yihu/wlyy/web/patient/medical/PatientMedicalRecordController.java

@@ -8,8 +8,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.yihu.wlyy.entity.patient.PatientMedicalRecords;
@@ -24,7 +26,7 @@ import com.yihu.wlyy.web.BaseController;
 *
 */
@Controller
@RequestMapping(value = "/patient/medical/record")
@RequestMapping(value = "/patient/medical/record", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "患者端-病历夹")
public class PatientMedicalRecordController extends BaseController {

src/main/java/com/yihu/wlyy/web/patient/scheduling/SchedulingController.java

@@ -8,8 +8,10 @@ import com.yihu.wlyy.service.app.sign.FamilyContractService;
import io.swagger.annotations.Api;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.yihu.wlyy.entity.doctor.schedule.DoctorScheduling;
@@ -23,7 +25,7 @@ import com.yihu.wlyy.web.BaseController;
 * 医生排班控制类
 */
@Controller
@RequestMapping(value = "patient/scheduling")
@RequestMapping(value = "patient/scheduling", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "医生排班")
public class SchedulingController extends BaseController {

src/main/java/com/yihu/wlyy/web/patient/sign/FamilyContractController.java

@@ -22,8 +22,10 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -36,7 +38,7 @@ import java.util.List;
 *
 */
@Controller
@RequestMapping(value = "/patient/family_contract")
@RequestMapping(value = "/patient/family_contract", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "患者端-家庭签约")
public class FamilyContractController extends BaseController {

src/main/java/com/yihu/wlyy/web/patient/sign/FamilyWithoutFilterController.java

@@ -5,15 +5,17 @@ import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
/**
 * Created by Administrator on 2016.08.26.
 */
@Controller
@RequestMapping(value = "/family_contract/homepage")
@RequestMapping(value = "/family_contract/homepage", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "家庭查询-无过滤")
public class FamilyWithoutFilterController extends BaseController {

src/main/java/com/yihu/wlyy/web/patient/sign/PatientSignController.java

@@ -10,7 +10,9 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -18,8 +20,8 @@ import com.yihu.wlyy.entity.patient.SignWeb;
import com.yihu.wlyy.service.app.sign.SignWebService;
import com.yihu.wlyy.web.BaseController;
@RequestMapping(value = "/patient/sign")
@RestController
@RequestMapping(value = "/patient/sign", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "患者端-签约管理")
public class PatientSignController extends BaseController {

src/main/java/com/yihu/wlyy/web/patient/talk/PatientDiscussionGroupController.java

@@ -3,8 +3,10 @@ package com.yihu.wlyy.web.patient.talk;
import io.swagger.annotations.Api;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -12,7 +14,7 @@ import com.yihu.wlyy.service.app.talk.TalkGroupService;
import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "/patient/talkgroup")
@RequestMapping(value = "/patient/talkgroup", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "患者端-讨论组")
public class PatientDiscussionGroupController extends BaseController {

src/main/java/com/yihu/wlyy/web/statistic/StatisticsController.java

@@ -8,15 +8,17 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
/**
 * Created by lyr on 2016/08/16.
 */
@Controller
@RequestMapping(value = "/statistics")
@RequestMapping(value = "/statistics", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "统计")
public class StatisticsController extends BaseController {

src/main/java/com/yihu/wlyy/web/third/GuaihaoController.java

@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -32,7 +33,7 @@ import java.util.Map;
@Controller
@RequestMapping(value = "/third/guahao")
@Api(description = "预约挂号接口")
public class GuaihaoController extends WeixinBaseController {
public class BookingController extends WeixinBaseController {
	@Autowired
	private GuahaoXMService guahaoXM;

src/main/java/com/yihu/wlyy/web/wx/HealthServiceController.java

@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse;
import io.swagger.annotations.Api;
import org.json.JSONException;
import org.json.JSONObject;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,7 +16,7 @@ import com.yihu.wlyy.util.SystemConf;
import com.yihu.wlyy.web.WeixinBaseController;
@Controller
@RequestMapping("/wx/health/service")
@RequestMapping(value = "/wx/health/service", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "患者端-健康服务在线咨询")
public class HealthServiceController extends WeixinBaseController {

src/main/java/com/yihu/wlyy/web/wx/WechatCoreController.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -24,7 +25,7 @@ import java.util.Arrays;
 * Created by lyr on 2016/08/11.
 */
@Controller
@RequestMapping(value = "/weixin")
@RequestMapping(value = "/weixin", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = RequestMethod.GET)
@Api(description = "微信")
public class WechatCoreController extends WeixinBaseController {