代码优化

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

@@ -19,6 +19,7 @@ import com.yihu.wlyy.service.common.account.TokenService;
import com.yihu.wlyy.util.*;
import com.yihu.wlyy.web.WeixinBaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -76,6 +77,7 @@ public class PatientController extends WeixinBaseController {
     */
    @RequestMapping(value = "baseinfo")
    @ResponseBody
    @ApiOperation("患者基本信息查询接口")
    public String baseinfo() {
        try {
//            Patient temp = patientInfoService.findByCode(getUID());
@@ -158,6 +160,7 @@ public class PatientController extends WeixinBaseController {
     */
    @RequestMapping(value = "saveWXPhote")
    @ResponseBody
    @ApiOperation("患者微信圖片信息保存")
    public String saveWXPhote(String mediaIds) {
        try {
            //下載微信的圖片保存到自己的服務器
@@ -186,6 +189,7 @@ public class PatientController extends WeixinBaseController {
     */
    @RequestMapping(value = "save")
    @ResponseBody
    @ApiOperation("患者基本信息保存")
    public String save(@RequestParam(required = false) String photo,
                       @RequestParam(required = false) String name,
                       @RequestParam(required = false) Integer sex,
@@ -246,6 +250,7 @@ public class PatientController extends WeixinBaseController {
     */
    @RequestMapping(value = "info")
    @ResponseBody
    @ApiOperation("患者信息查询接口")
    public String info( @RequestParam(required = false)String patientCode) {
        try {
            if(org.springframework.util.StringUtils.isEmpty(patientCode)){
@@ -318,6 +323,7 @@ public class PatientController extends WeixinBaseController {
     */
    @RequestMapping(value = "updatepwd")
    @ResponseBody
    @ApiOperation("修改密码")
    public String updatepwd(String oldpwd, String newpwd) {
        try {
            Patient patient = patientInfoService.findByCode(getUID());
@@ -346,6 +352,7 @@ public class PatientController extends WeixinBaseController {
     */
    @RequestMapping(value = "loginout")
    @ResponseBody
    @ApiOperation("退出登录")
    public String loginout() {
        try {
            tokenService.delToken(1, getUID());
@@ -363,6 +370,7 @@ public class PatientController extends WeixinBaseController {
     */
    @RequestMapping(value = "wxloginout")
    @ResponseBody
    @ApiOperation("微信用户退出登录")
    public String wxloginout() {
        try {
            Patient patient = patientInfoService.findByCode(getUID());
@@ -398,6 +406,7 @@ public class PatientController extends WeixinBaseController {
     */
    @RequestMapping(value = "teachers")
    @ResponseBody
    @ApiOperation("登录患者获取三师信息")
    public String teachers(@RequestParam(required = false, defaultValue = "") String signDoctor) {
        try {
            String code = getUID();//getUID();
@@ -463,6 +472,7 @@ public class PatientController extends WeixinBaseController {
     */
    @RequestMapping(value = "docInfo")
    @ResponseBody
    @ApiOperation("医生基本信息查询接口")
    public String doctorInfo(String doctor) {
        try {
            Doctor temp = doctorService.findDoctorByCode(doctor);
@@ -509,6 +519,7 @@ public class PatientController extends WeixinBaseController {
     */
    @RequestMapping(value = "sign_status")
    @ResponseBody
    @ApiOperation("查询患者签约状态")
    public String signStaus() {
        try {
            Map<String, String> teamDoctors = new HashMap<>();
@@ -584,6 +595,7 @@ public class PatientController extends WeixinBaseController {
     */
    @RequestMapping(value = "sign_doctors")
    @ResponseBody
    @ApiOperation("查询患者签约状态")
    public String signDoctors() {
        try {
            List<JSONObject> teamDoctors = new ArrayList<>();
@@ -678,6 +690,7 @@ public class PatientController extends WeixinBaseController {
     */
    @RequestMapping(value = "is_sign")
    @ResponseBody
    @ApiOperation("查询患者是否有签约信息")
    public String isSign() {
        try {
            JSONObject jsonObject = new JSONObject();
@@ -705,6 +718,7 @@ public class PatientController extends WeixinBaseController {
     */
    @RequestMapping(value = "idc")
    @ResponseBody
    @ApiOperation("查询患者身份证号")
    public String idcard() {
        try {
            Patient temp = patientInfoService.findByCode(getUID());
@@ -722,6 +736,7 @@ public class PatientController extends WeixinBaseController {
     */
    @RequestMapping(value = "getPatientByInviLogCode")
    @ResponseBody
    @ApiOperation("根據邀請紀錄查詢邀請人信息")
    public String getPatientByInviLogCode(String invilogCode) {
        try {
            Patient temp = patientInfoService.invilogCode(invilogCode);
@@ -765,6 +780,7 @@ public class PatientController extends WeixinBaseController {
     */
    @RequestMapping(value = "/mobile_update", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("居民手机号变更")
    public String changePatientMobile(String mobile, String captcha, int type) {
        try {
            if (StringUtils.isEmpty(mobile)) {
@@ -802,6 +818,7 @@ public class PatientController extends WeixinBaseController {
     */
    @RequestMapping("/is_mobile_register")
    @ResponseBody
    @ApiOperation("手机号是否注册")
    public String isMobileRegister(String mobile) {
        try {
            if (StringUtils.isEmpty(mobile)) {
@@ -827,6 +844,7 @@ public class PatientController extends WeixinBaseController {
     */
    @RequestMapping(value = "/updatePassword", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("修改密码")
    public String updatePassword(String newPassword1,
                                 String newPassword2,
                                 String oldPassword) {
@@ -854,6 +872,7 @@ public class PatientController extends WeixinBaseController {
     */
    @RequestMapping(value = "/switch_account")
    @ResponseBody
    @ApiOperation("切换家庭成员账号")
    public String switchFamilyAccount(String family, String openid) {
        try {
            if (StringUtils.isEmpty(family)) {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/archives/PatientArchivesController.java

@@ -32,7 +32,7 @@ import java.util.Map;
 * Created by hzp on 2016/11/24.
 */
@Controller
@RequestMapping(value = "/patient/archives", produces = MediaType.APPLICATION_JSON_UTF8_VALUE,method = {RequestMethod.GET,RequestMethod.POST})
@RequestMapping(value = "/patient/archives", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者端-健康档案服务接口")
public class PatientArchivesController extends WeixinBaseController {

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

@@ -4,6 +4,7 @@ import java.util.Date;
//import io.swagger.annotations.Api;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -49,6 +50,7 @@ public class ConsultCommunicationController extends WeixinBaseController {
	 */
	@RequestMapping(value = "add")
	@ResponseBody
	@ApiOperation("添加病友圈帖子")
	public String add(String question, String content, @RequestParam(required = false) String images, @RequestParam(required = false) String disease, @RequestParam(required = false) String diseaseName) {
		try {
			ConsultCommunication cp = new ConsultCommunication();
@@ -95,6 +97,7 @@ public class ConsultCommunicationController extends WeixinBaseController {
	 */
	@RequestMapping(value = "list")
	@ResponseBody
	@ApiOperation("查询病友圈帖子列表")
	public String list(int type, @RequestParam(required = false) String disease, long id, int pagesize) {
		try {
			JSONArray list = new JSONArray();
@@ -145,6 +148,7 @@ public class ConsultCommunicationController extends WeixinBaseController {
	 */
	@RequestMapping(value = "reply")
	@ResponseBody
	@ApiOperation("回复病友圈")
	public String reply(String consult, String content, @RequestParam(required = false) String images) {
		try {
			ConsultCommunicationReply reply = new ConsultCommunicationReply();
@@ -181,6 +185,7 @@ public class ConsultCommunicationController extends WeixinBaseController {
	 */
	@RequestMapping(value = "reply_list")
	@ResponseBody
	@ApiOperation("查询回复列表")
	public String replyList(String consult, long id, int pagesize) {
		try {
			JSONArray list = new JSONArray();
@@ -229,6 +234,7 @@ public class ConsultCommunicationController extends WeixinBaseController {
	 */
	@RequestMapping(value = "info")
	@ResponseBody
	@ApiOperation("查询公共咨询详细信息")
	public String info(String consult) {
		try {
			JSONObject json = new JSONObject();

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

@@ -100,6 +100,7 @@ public class ConsultController extends WeixinBaseController {
     */
    @RequestMapping(value = "records")
    @ResponseBody
    @ApiOperation("患者咨询记录查询")
    public String consultRecords(
            @RequestParam(required = false) String title,
            long id,
@@ -156,6 +157,7 @@ public class ConsultController extends WeixinBaseController {
     */
    @RequestMapping(value = "/doctor_worktime/week")
    @ResponseBody
    @ApiOperation("获取医生的排班时间")
    public String getDoctorWeekWorkTime(String doctor, String week) {
        try {
            JSONObject result = doctorWorkTimeService.findDoctorWeekWorkTime(doctor, week);
@@ -175,6 +177,7 @@ public class ConsultController extends WeixinBaseController {
     */
    @RequestMapping(value = "/doctor_worktime")
    @ResponseBody
    @ApiOperation("获取医生某天的排班时间")
    public String getDoctorWorkTime(String doctor) {
        try {
            JSONObject result = doctorWorkTimeService.findDoctorWorkTime(doctor);
@@ -194,6 +197,7 @@ public class ConsultController extends WeixinBaseController {
     */
    @RequestMapping(value = "is_doctor_working")
    @ResponseBody
    @ApiOperation("医生是否在工作")
    public String isDoctorAtWorking(String doctor) {
        try {
            JSONObject result = doctorWorkTimeService.isDoctorWorking(doctor);
@@ -212,6 +216,7 @@ public class ConsultController extends WeixinBaseController {
     */
    @RequestMapping(value = "is_famous_doctor_working")
    @ResponseBody
    @ApiOperation("名医是否在工作")
    public String isFamousDoctorAtWorking(String doctor) {
        try {
            JSONObject result = doctorWorkTimeService.isFamousDoctorWorking(doctor);
@@ -228,6 +233,7 @@ public class ConsultController extends WeixinBaseController {
     * @param doctor
     * @return
     */
    @ApiOperation("名医咨询剩余次数查询")
    @RequestMapping(value = "/consult_times_remain")
    @ResponseBody
    public String famousDoctorTimesRemain(String doctor) {
@@ -247,6 +253,7 @@ public class ConsultController extends WeixinBaseController {
     */
    @RequestMapping(value = "/unfinished")
    @ResponseBody
    @ApiOperation("获取未完成咨询")
    public String getUnFinishedConsult() {
        try {
//            List<ConsultTeam> unfinishedConsult = consultTeamService.getUnfinishedConsult(getUID());
@@ -267,6 +274,7 @@ public class ConsultController extends WeixinBaseController {
     */
    @RequestMapping(value = "/is_consult_unfinished", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    @ApiOperation("查询居民与某个医生是否存在未结束的咨询")
    public String isExistsUnfinishedConsult(@RequestParam(required = true) String doctor) {
        try {
            JSONObject result = new JSONObject();
@@ -296,6 +304,7 @@ public class ConsultController extends WeixinBaseController {
     */
    @RequestMapping(value = "add")
    @ResponseBody
    @ApiOperation("三师咨询添加接口")
    public String add(@RequestParam(required = false) Integer type,
                      @RequestParam(required = false) String when,
                      @RequestParam String symptoms,
@@ -411,6 +420,7 @@ public class ConsultController extends WeixinBaseController {
     */
    @RequestMapping(value = "famousAdd")
    @ResponseBody
    @ApiOperation("名医咨询添加接口")
    public String famousAdd(
            @RequestParam(required = false) String when,
            String symptoms,
@@ -480,6 +490,7 @@ public class ConsultController extends WeixinBaseController {
     */
    @RequestMapping(value = "famousDoctorList")
    @ResponseBody
    @ApiOperation("名医列表")
    public String famousDoctorList(
            @RequestParam(required = false) String name) {
        try {
@@ -565,6 +576,7 @@ public class ConsultController extends WeixinBaseController {
     */
    @RequestMapping(value = "list")
    @ResponseBody
    @ApiOperation("查询患者三师咨询咨询列表")
    public String list(int status, long id, int pagesize) {
        try {
            Page<ConsultTeam> consults = consultTeamService.findByPatient(getRepUID(), status, id, pagesize);
@@ -612,6 +624,7 @@ public class ConsultController extends WeixinBaseController {
     */
    @RequestMapping(value = "cancel")
    @ResponseBody
    @ApiOperation("患者取消三师咨询")
    public String cancel(String consult) {
        try {
            int row = consultTeamService.cancel(consult);
@@ -634,6 +647,7 @@ public class ConsultController extends WeixinBaseController {
     */
    @RequestMapping(value = "finish")
    @ResponseBody
    @ApiOperation("修改状态为1的咨询记录为结束")
    public String finish(@RequestParam(required = true) String code) {
        try {
            int row = consultTeamService.finishConsult(code, getRepUID(), 1);
@@ -661,6 +675,7 @@ public class ConsultController extends WeixinBaseController {
     */
    @RequestMapping(value = "append")
    @ResponseBody
    @ApiOperation("三师咨询追问接口")
    public String append(@RequestParam String consult, @RequestParam String content, @RequestParam int type, @RequestParam(required = false, defaultValue = "0") Integer times) {
        try {
            List<ConsultTeamLog> logs = new ArrayList<ConsultTeamLog>();
@@ -757,6 +772,7 @@ public class ConsultController extends WeixinBaseController {
     */
    @RequestMapping(value = "loglist")
    @ResponseBody
    @ApiOperation("网络咨询咨询日志查询")
    public String loglist(@RequestParam String consult, @RequestParam int page, @RequestParam int pagesize) {
        try {
            ConsultTeam consultModel = consultTeamService.findByCode(consult);
@@ -783,6 +799,7 @@ public class ConsultController extends WeixinBaseController {
     */
    @RequestMapping(value = "logs")
    @ResponseBody
    @ApiOperation("网络咨询咨询日志查询")
    public String logs(@RequestParam String sessionId,@RequestParam(required = false) String startMsgId,@RequestParam(required = false) String endMsgId, @RequestParam int page, @RequestParam int pagesize) {
        try {
            JSONArray messageArray = ImUtill.getSessionMessage(sessionId, startMsgId, endMsgId, page, pagesize, getRepUID());
@@ -818,6 +835,7 @@ public class ConsultController extends WeixinBaseController {
     */
    @RequestMapping(value = "oneLog")
    @ResponseBody
    @ApiOperation("查找单个咨询记录")
    public String oneLog(@RequestParam String consult, @RequestParam Long logId, @RequestParam int msgType) {
        try {
            ConsultTeam consultModel = consultTeamService.findByCode(consult);
@@ -885,6 +903,7 @@ public class ConsultController extends WeixinBaseController {
     */
    @RequestMapping(value = "comment")
    @ResponseBody
    @ApiOperation("三师咨询评论")
    public String comment(String consult, String content, int star) {
        try {
            // 保存评价

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

@@ -6,6 +6,7 @@ import com.yihu.wlyy.service.app.consult.ConsultMoviService;
import com.yihu.wlyy.service.app.consult.DoctorCommentService;
import com.yihu.wlyy.web.WeixinBaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.json.JSONArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -35,6 +36,7 @@ public class ConsultMoviController extends WeixinBaseController {
	 */
	@RequestMapping(value = "doctors")
	@ResponseBody
	@ApiOperation("视频咨询三师医生查询接口")
	public String doctors() {
		try {
			JSONArray jsonArray = new JSONArray();
@@ -62,6 +64,7 @@ public class ConsultMoviController extends WeixinBaseController {
	 */
	@RequestMapping(value = "add")
	@ResponseBody
	@ApiOperation("添加电话视频咨询预约")
	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 {
			return success("预约成功！");
@@ -80,6 +83,7 @@ public class ConsultMoviController extends WeixinBaseController {
	 */
	@RequestMapping(value = "comment")
	@ResponseBody
	@ApiOperation("视频咨询评论")
	public String comment(String consult, String content, int star) {
		try {
			// 查询视频咨询信息

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

@@ -9,6 +9,7 @@ import com.yihu.wlyy.util.CommonUtil;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.web.WeixinBaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -25,271 +26,274 @@ import java.util.Date;
/**
 * 患者端：图文咨询/公共咨询/病友圈控制类
 * 
 * @author George
 *
 * @author George
 */
@Controller
@RequestMapping(value = "/patient/consult/public", produces = MediaType.APPLICATION_JSON_UTF8_VALUE,method = {RequestMethod.GET,RequestMethod.POST})
@RequestMapping(value = "/patient/consult/public", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, method = {RequestMethod.GET, RequestMethod.POST})
@Api(description = "图文咨询,公共咨询,病友圈")
public class ConsultPublicController extends WeixinBaseController {
	@Autowired
	private ConsultPublicService consultPublicService;
    @Autowired
    private ConsultPublicService consultPublicService;
	@Autowired
	private PatientInfoService patientInfoService;
	@Autowired
	private CommonUtil CommonUtil;
    @Autowired
    private PatientInfoService patientInfoService;
    @Autowired
    private CommonUtil CommonUtil;
	/**
	 * 添加公共咨询
	 * 
	 * @param question 问题
	 * @param content 问题描述
	 * @param when 发病时间（如：1小时前）
	 * @param images 图片标识，多图以逗号分隔
	 * @param images 图片URL，多图以逗号分隔
	 * @param disease 疾病类型标识
	 * @param diseaseName 疾病类型名称
	 * @return
	 */
	@RequestMapping(value = "add")
	@ResponseBody
	public String add(
			String question,
			String content,
			String when,
			@RequestParam(required = false) String images,
			@RequestParam(required = false) String disease,
			@RequestParam(required = false) String diseaseName) {
		try {
			ConsultPublic cp = new ConsultPublic();
			// 回复数默认为0
			cp.setAmount(0);
			// 设置问题描述
			cp.setContent(content);
			// 设置图片URL
			if (StringUtils.isEmpty(images)) {
				images = fetchWxImages();
			}
			if (StringUtils.isNotEmpty(images)) {
				images = CommonUtil.copyTempImage(images);
			}
			cp.setImages(images);
			// 设置患者标识
			cp.setPatient(getRepUID());
    /**
     * 添加公共咨询
     *
     * @param question    问题
     * @param content     问题描述
     * @param when        发病时间（如：1小时前）
     * @param images      图片标识，多图以逗号分隔
     * @param images      图片URL，多图以逗号分隔
     * @param disease     疾病类型标识
     * @param diseaseName 疾病类型名称
     * @return
     */
    @RequestMapping(value = "add")
    @ResponseBody
    @ApiOperation("添加公共咨询")
    public String add(
            String question,
            String content,
            String when,
            @RequestParam(required = false) String images,
            @RequestParam(required = false) String disease,
            @RequestParam(required = false) String diseaseName) {
        try {
            ConsultPublic cp = new ConsultPublic();
            // 回复数默认为0
            cp.setAmount(0);
            // 设置问题描述
            cp.setContent(content);
            // 设置图片URL
            if (StringUtils.isEmpty(images)) {
                images = fetchWxImages();
            }
            if (StringUtils.isNotEmpty(images)) {
                images = CommonUtil.copyTempImage(images);
            }
            cp.setImages(images);
            // 设置患者标识
            cp.setPatient(getRepUID());
//			cp.setPatient(getUID());
//			Patient patient=patientInfoService.findByCode(getUID());
			Patient patient=patientInfoService.findByCode(getRepUID());
			cp.setSex(patient.getSex());
			// 设置问题标题
			cp.setTitle(question);
			// 未读数量默认为0
			cp.setUnread(0);
			// 设置发病时间
			cp.setWhen(when);
			// 设置疾病类型
			cp.setDisease(disease);
			// 设置疾病类型名称
			cp.setDiseaseName(diseaseName);
			// 保存到数据库
			ConsultPublic temp = consultPublicService.addConsult(cp);
			if (temp == null) {
				return error(-1, "保存失败！");
			}
			return success("保存成功！");
		} catch (Exception e) {
			error(e);
			return error(-1, "保存失败！");
		}
	}
            Patient patient = patientInfoService.findByCode(getRepUID());
            cp.setSex(patient.getSex());
            // 设置问题标题
            cp.setTitle(question);
            // 未读数量默认为0
            cp.setUnread(0);
            // 设置发病时间
            cp.setWhen(when);
            // 设置疾病类型
            cp.setDisease(disease);
            // 设置疾病类型名称
            cp.setDiseaseName(diseaseName);
            // 保存到数据库
            ConsultPublic temp = consultPublicService.addConsult(cp);
            if (temp == null) {
                return error(-1, "保存失败！");
            }
            return success("保存成功！");
        } catch (Exception e) {
            error(e);
            return error(-1, "保存失败！");
        }
    }
	/**
	 * 查询患者公共咨询记录
	 * 
	 * @param pagesize 分页大小
	 * @return
	 */
	@RequestMapping(value = "list")
	@ResponseBody
	public String list(long id, int pagesize, @RequestParam(required = false) String disease) {
		try {
			JSONArray list = new JSONArray();
			Page<ConsultPublic> datas = consultPublicService.findPublicQuestionByPatient(getRepUID(), disease, id, pagesize);
    /**
     * 查询患者公共咨询记录
     *
     * @param pagesize 分页大小
     * @return
     */
    @RequestMapping(value = "list")
    @ResponseBody
    @ApiOperation("查询患者公共咨询记录")
    public String list(long id, int pagesize, @RequestParam(required = false) String disease) {
        try {
            JSONArray list = new JSONArray();
            Page<ConsultPublic> datas = consultPublicService.findPublicQuestionByPatient(getRepUID(), disease, id, pagesize);
//			Page<ConsultPublic> datas = consultPublicService.findPublicQuestionByPatient(getUID(), disease, id, pagesize);
			if (datas != null) {
				for (ConsultPublic cp : datas) {
					if (cp == null) {
						continue;
					}
					JSONObject json = new JSONObject();
					json.put("id", cp.getId());
					// 设置问题标识
					json.put("consult", cp.getConsult());
					// 设置患者姓名
					json.put("name", cp.getName());
					// 设置患者头像
					json.put("photo", cp.getPhoto());
					// 设置问题标题
					json.put("title", cp.getTitle());
					// 设置问题描述
					json.put("content", cp.getContent());
					// 设置发病时间
					json.put("when", cp.getWhen());
					// 设置疾病标识
					json.put("disease", cp.getDisease());
					// 设置性别
					json.put("sex", cp.getSex());
					// 设置疾病名称
					json.put("diseaseName", cp.getDiseaseName());
					// 设置是否包含图片
					json.put("hasImg", StringUtils.isNoneEmpty(cp.getImages()));
					// 设置回复总数
					json.put("amount", cp.getAmount());
					// 咨询时间
					json.put("czrq",cp.getCzrq());
            if (datas != null) {
                for (ConsultPublic cp : datas) {
                    if (cp == null) {
                        continue;
                    }
                    JSONObject json = new JSONObject();
                    json.put("id", cp.getId());
                    // 设置问题标识
                    json.put("consult", cp.getConsult());
                    // 设置患者姓名
                    json.put("name", cp.getName());
                    // 设置患者头像
                    json.put("photo", cp.getPhoto());
                    // 设置问题标题
                    json.put("title", cp.getTitle());
                    // 设置问题描述
                    json.put("content", cp.getContent());
                    // 设置发病时间
                    json.put("when", cp.getWhen());
                    // 设置疾病标识
                    json.put("disease", cp.getDisease());
                    // 设置性别
                    json.put("sex", cp.getSex());
                    // 设置疾病名称
                    json.put("diseaseName", cp.getDiseaseName());
                    // 设置是否包含图片
                    json.put("hasImg", StringUtils.isNoneEmpty(cp.getImages()));
                    // 设置回复总数
                    json.put("amount", cp.getAmount());
                    // 咨询时间
                    json.put("czrq", cp.getCzrq());
					list.put(json);
				}
			}
			return write(200, "查询成功！", "list", datas, list);
		} catch (Exception e) {
			error(e);
			return error(-1, "查询失败！");
		}
	}
                    list.put(json);
                }
            }
            return write(200, "查询成功！", "list", datas, list);
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败！");
        }
    }
	/**
	 * 回复公共咨询
	 * @param consult 咨询标识
	 * @param content 回复内容
	 * @param images 回复图片，多图以逗号分隔
	 * @return
	 */
	@RequestMapping(value = "reply")
	@ResponseBody
	public String reply(String consult, String content, @RequestParam(required = false) String images) {
		try {
			ConsultPublicReply reply = new ConsultPublicReply();
			reply.setConsult(consult);
			reply.setContent(content);
			reply.setCzrq(new Date());
			reply.setDel("1");
			// 设置图片URL
			if (StringUtils.isEmpty(images)) {
				images = fetchWxImages();
			}
			if (StringUtils.isNotEmpty(images)) {
				images = CommonUtil.copyTempImage(images);
			}
			reply.setImages(images);
    /**
     * 回复公共咨询
     *
     * @param consult 咨询标识
     * @param content 回复内容
     * @param images  回复图片，多图以逗号分隔
     * @return
     */
    @RequestMapping(value = "reply")
    @ResponseBody
    @ApiOperation("回复公共咨询")
    public String reply(String consult, String content, @RequestParam(required = false) String images) {
        try {
            ConsultPublicReply reply = new ConsultPublicReply();
            reply.setConsult(consult);
            reply.setContent(content);
            reply.setCzrq(new Date());
            reply.setDel("1");
            // 设置图片URL
            if (StringUtils.isEmpty(images)) {
                images = fetchWxImages();
            }
            if (StringUtils.isNotEmpty(images)) {
                images = CommonUtil.copyTempImage(images);
            }
            reply.setImages(images);
//			reply.setPatient(getUID());
//			Patient patient=patientInfoService.findByCode(getUID());
			reply.setPatient(getRepUID());
			Patient patient=patientInfoService.findByCode(getRepUID());
			reply.setSex(patient.getSex());
			ConsultPublicReply temp = consultPublicService.addPatientReply(reply);
			if (temp == null) {
				return error(-1, "回复失败！");
			}
			return success("回复成功！");
		} catch (Exception e) {
			error(e);
			return error(-1, "回复失败！");
		}
	}
            reply.setPatient(getRepUID());
            Patient patient = patientInfoService.findByCode(getRepUID());
            reply.setSex(patient.getSex());
            ConsultPublicReply temp = consultPublicService.addPatientReply(reply);
            if (temp == null) {
                return error(-1, "回复失败！");
            }
            return success("回复成功！");
        } catch (Exception e) {
            error(e);
            return error(-1, "回复失败！");
        }
    }
	/**
	 * 查询公共咨询的回复列表
	 * 
	 * @param consult
	 *            咨询标识
	 * @param pagesize
	 *            分页大小
	 * @return
	 */
	@RequestMapping(value = "reply_list")
	@ResponseBody
	public String replyList(String consult, long id, int pagesize) {
		try {
			JSONArray list = new JSONArray();
			Page<ConsultPublicReply> datas = consultPublicService.findReplyListByConsult(consult, id, pagesize);
			if (datas != null) {
				for (ConsultPublicReply cpr : datas) {
					if (cpr == null) {
						continue;
					}
					JSONObject json = new JSONObject();
					// 设置回复标识
					json.put("id", cpr.getId());
					// 设置回复者姓名
					json.put("name", cpr.getName());
					// 设置回复者头像
					json.put("photo", cpr.getPhoto());
					// 设置回复内容
					json.put("content", cpr.getContent());
					// 设置回复图片
					json.put("images", cpr.getImages());
					// 设置回复时间
					json.put("czrq", DateUtil.dateToStrLong(cpr.getCzrq()));
					list.put(json);
				}
			}
			if (id <= 0) {
				ConsultPublic temp = consultPublicService.findByConsult(consult);
    /**
     * 查询公共咨询的回复列表
     *
     * @param consult  咨询标识
     * @param pagesize 分页大小
     * @return
     */
    @RequestMapping(value = "reply_list")
    @ResponseBody
    @ApiOperation("查询公共咨询的回复列表")
    public String replyList(String consult, long id, int pagesize) {
        try {
            JSONArray list = new JSONArray();
            Page<ConsultPublicReply> datas = consultPublicService.findReplyListByConsult(consult, id, pagesize);
            if (datas != null) {
                for (ConsultPublicReply cpr : datas) {
                    if (cpr == null) {
                        continue;
                    }
                    JSONObject json = new JSONObject();
                    // 设置回复标识
                    json.put("id", cpr.getId());
                    // 设置回复者姓名
                    json.put("name", cpr.getName());
                    // 设置回复者头像
                    json.put("photo", cpr.getPhoto());
                    // 设置回复内容
                    json.put("content", cpr.getContent());
                    // 设置回复图片
                    json.put("images", cpr.getImages());
                    // 设置回复时间
                    json.put("czrq", DateUtil.dateToStrLong(cpr.getCzrq()));
                    list.put(json);
                }
            }
            if (id <= 0) {
                ConsultPublic temp = consultPublicService.findByConsult(consult);
//				if (temp != null && StringUtils.equals(temp.getPatient(), getUID())) {
				if (temp != null && StringUtils.equals(temp.getPatient(), getRepUID())) {
					// 自己的帖子，清空未读数量
					consultPublicService.clearUnread(consult);
				}
			}
			return write(200, "查询成功！", "list", datas, list);
		} catch (Exception e) {
			error(e);
			return error(-1, "查询失败！");
		}
	}
                if (temp != null && StringUtils.equals(temp.getPatient(), getRepUID())) {
                    // 自己的帖子，清空未读数量
                    consultPublicService.clearUnread(consult);
                }
            }
            return write(200, "查询成功！", "list", datas, list);
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败！");
        }
    }
	/**
	 * 查询公共咨询详细信息
	 * 
	 * @param consult
	 * @return
	 */
	@RequestMapping(value = "info")
	@ResponseBody
	public String info(String consult) {
		try {
			JSONObject json = new JSONObject();
			ConsultPublic cp = consultPublicService.findByConsult(consult);
			if (cp != null) {
				// 设置咨询标识
				json.put("consult", cp.getConsult());
				// 设置姓名
				json.put("name", cp.getName());
				// 设置头像
				json.put("photo", cp.getPhoto());
				// 设置问题
				json.put("question", cp.getTitle());
				// 设置问题描述
				json.put("content", cp.getContent());
				// 设置发病时间
				json.put("when", cp.getWhen());
				// 设置回复图片
				json.put("images", cp.getImages());
				// 设置疾病标识
				json.put("disease", cp.getDisease());
				// 设置疾病名称
				json.put("diseaseName", cp.getDiseaseName());
				// 设置回复时间
				json.put("czrq", DateUtil.dateToStrLong(cp.getCzrq()));
			}
			return write(200, "查询成功！", "data", json);
		} catch (Exception e) {
			error(e);
			return error(-1, "查询失败！");
		}
	}
    /**
     * 查询公共咨询详细信息
     *
     * @param consult
     * @return
     */
    @RequestMapping(value = "info")
    @ResponseBody
    @ApiOperation("查询公共咨询详细信息")
    public String info(String consult) {
        try {
            JSONObject json = new JSONObject();
            ConsultPublic cp = consultPublicService.findByConsult(consult);
            if (cp != null) {
                // 设置咨询标识
                json.put("consult", cp.getConsult());
                // 设置姓名
                json.put("name", cp.getName());
                // 设置头像
                json.put("photo", cp.getPhoto());
                // 设置问题
                json.put("question", cp.getTitle());
                // 设置问题描述
                json.put("content", cp.getContent());
                // 设置发病时间
                json.put("when", cp.getWhen());
                // 设置回复图片
                json.put("images", cp.getImages());
                // 设置疾病标识
                json.put("disease", cp.getDisease());
                // 设置疾病名称
                json.put("diseaseName", cp.getDiseaseName());
                // 设置回复时间
                json.put("czrq", DateUtil.dateToStrLong(cp.getCzrq()));
            }
            return write(200, "查询成功！", "data", json);
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败！");
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/consult/EvaluateController.java

@@ -8,6 +8,7 @@ import com.yihu.wlyy.service.app.consult.EvaluateLabelService;
import com.yihu.wlyy.service.app.consult.EvaluateService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +43,7 @@ public class EvaluateController  extends BaseController {
     */
    @RequestMapping(value = "save")
    @ResponseBody
    @ApiOperation("保存评价")
    public String save(@RequestParam(required = true,value="evaluate") String evaluateJson){
        try{
            evaluateService.saveByJson(evaluateJson,getRepUID());
@@ -60,6 +62,7 @@ public class EvaluateController  extends BaseController {
     */
    @RequestMapping(value = "update")
    @ResponseBody
    @ApiOperation("更新平均")
    public String updete(@RequestParam(required = true,value="evaluate") String evaluateJson){
        try{
            evaluateService.updateByJson(evaluateJson,getRepUID());
@@ -77,6 +80,7 @@ public class EvaluateController  extends BaseController {
     */
    @RequestMapping(value = "list")
    @ResponseBody
    @ApiOperation("获取评价")
    public String list(@RequestParam(required = true,value="consult") String consult,@RequestParam(required = false,value="type") Integer type){
        try{
            List<Evaluate> evaluates = null;
@@ -114,6 +118,7 @@ public class EvaluateController  extends BaseController {
     */
    @RequestMapping(value = "doctor/label")
    @ResponseBody
    @ApiOperation("保存评价")
    public String doctorLabel(@RequestParam(required = true,value="doctor") String doctor){
        try{
            List<Map<String,Object>> result = evaluateLabelService.findDistinctLabelByLaDoctor(doctor);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/device/PatientDeviceController.java

@@ -33,7 +33,7 @@ import java.util.Map;
 * @author George
 */
@Controller
@RequestMapping(value = "patient/device",method = {RequestMethod.GET,RequestMethod.POST})
@RequestMapping(value = "patient/device")
@Api(value = "患者设备管理", description = "患者设备管理")
public class PatientDeviceController extends BaseController {
@@ -235,7 +235,7 @@ public class PatientDeviceController extends BaseController {
     * 设备删除
     */
    @ApiOperation("设备删除")
    @RequestMapping(value = "DeletePatientDevice")
    @RequestMapping(value = "DeletePatientDevice",method = {RequestMethod.GET,RequestMethod.POST})
    @ResponseBody
    public String delete(@ApiParam(name = "id", value = "删除设备关联ID")
                         @RequestParam(value = "id", required = true) String id) {

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

@@ -4,6 +4,7 @@ import com.yihu.wlyy.entity.patient.invitation.PatientInvitationLog;
import com.yihu.wlyy.service.app.family.FamilyService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
@@ -30,6 +31,7 @@ public class PatientFamilyController extends BaseController {
     */
    @ResponseBody
    @RequestMapping("/getPatientInviteLog")
    @ApiOperation("查询医生是否有邀请改患者")
    public String getPatientInviteLog(String doctorCode, String invitePatientCode) {
        try {
            PatientInvitationLog patientInvitationLog = familyService.getPatientInviteLog(doctorCode, getUID(), invitePatientCode);
@@ -45,6 +47,7 @@ public class PatientFamilyController extends BaseController {
    @ResponseBody
    @RequestMapping("/findPatientInviteLog")
    @ApiOperation("查询医生是否有邀请改患者")
    public String findPatientInviteLog(String invitePatientCode) {
        try {
            PatientInvitationLog patientInvitationLog = familyService.getPatientInviteLog( invitePatientCode);
@@ -66,6 +69,7 @@ public class PatientFamilyController extends BaseController {
     */
    @ResponseBody
    @RequestMapping("/updatePatientInviteLog")
    @ApiOperation("更新邀请日志")
    public String updatePatientInviteLog(String patientInviteLogCode,
                                         String type) {
        try {

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

@@ -11,6 +11,7 @@ import com.yihu.wlyy.service.common.account.DoctorService;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.htmlparser.Parser;
import org.htmlparser.util.ParserException;
@@ -58,6 +59,7 @@ public class HealthEduArticleController extends BaseController {
     */
    @RequestMapping(value = "list")
    @ResponseBody
    @ApiOperation("查询文章列表")
    public String list(@RequestParam("id") long id, @RequestParam("pagesize") int pagesize, @RequestParam(required = true, value = "wheaType") int wheaType) {
        try {
//            List<HealthEduArticlePatient> list = healthEduArticlePatientService.findByPatient(getUID(), wheaType, id, pagesize);
@@ -113,6 +115,7 @@ public class HealthEduArticleController extends BaseController {
     */
    @RequestMapping(value = "article")
    @ResponseBody
    @ApiOperation("查询文章列表")
    public String article(@RequestParam(value = "article", required = true) String article) {
        try {
            //获取单条文章记录
@@ -162,6 +165,7 @@ public class HealthEduArticleController extends BaseController {
     */
    @RequestMapping(value = "read")
    @ResponseBody
    @ApiOperation("更新文章为已读")
    public String read(@RequestParam("article") String article) {
        try {
//            healthEduArticlePatientService.updateRead(getUID(), article);
@@ -193,6 +197,7 @@ public class HealthEduArticleController extends BaseController {
     */
    @RequestMapping(value = "/readAllArticle", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("对当前用户的所有未读文章设置为已读")
    public String readAllArticle() {
        try {
//            String patient = getUID();

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

@@ -1,6 +1,7 @@
package com.yihu.wlyy.web.patient.health;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +37,7 @@ public class HealthNewsController extends BaseController {
	 */
	@RequestMapping(value = "list")
	@ResponseBody
	@ApiOperation("查询资讯列表")
	public String list(long id, int pagesize) {
		try {
			Page<HealthNews> list = healthNewsService.findAll(id, pagesize);

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

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import java.util.*;
@Controller
@RequestMapping(value = "/patient/health_index", produces = MediaType.APPLICATION_JSON_UTF8_VALUE,method = {RequestMethod.GET,RequestMethod.POST})
@RequestMapping(value = "/patient/health_index", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者指标")
public class PatientHealthController extends BaseController {

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

@@ -3,6 +3,7 @@ package com.yihu.wlyy.web.patient.health;
import com.yihu.wlyy.service.app.health.PatientHealthGuidanceService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +34,7 @@ public class PatientHealthGuidanceController extends BaseController {
	 */
	@RequestMapping(value = "modifyStatus")
	@ResponseBody
	@ApiOperation("居民端一键已读")
	public String modifyStatus() {
		try {
			patientHealthGuidanceService.modifyStatus(getRepUID(),"1");
@@ -51,6 +53,7 @@ public class PatientHealthGuidanceController extends BaseController {
	 */
	@RequestMapping(value = "list")
	@ResponseBody
	@ApiOperation("查询患者的健康指导")
	public String list(@RequestParam String id, @RequestParam String pagesize) {
		try {
			Long idl = Long.parseLong(id);
@@ -72,6 +75,7 @@ public class PatientHealthGuidanceController extends BaseController {
	 */
	@RequestMapping(value = "/id")
	@ResponseBody
	@ApiOperation("获取某个健康指导")
	public String getHealthGuidance(@RequestParam  String id){
		try{
			Long idl = Long.parseLong(id);

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

@@ -13,6 +13,7 @@ import com.yihu.wlyy.util.CommonUtil;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.web.WeixinBaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -34,7 +35,7 @@ import java.util.List;
 *
 */
@Controller
@RequestMapping(value = "/patient/health_record", produces = MediaType.APPLICATION_JSON_UTF8_VALUE,method = {RequestMethod.GET,RequestMethod.POST})
@RequestMapping(value = "/patient/health_record", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者端-健康记录")
public class PatientHealthRecordController extends WeixinBaseController {
@@ -60,6 +61,7 @@ public class PatientHealthRecordController extends WeixinBaseController {
	 * @param value4 运动项目
	 * @return
	 */
	@ApiOperation("保健记录更改接口（包括手动记录的修改和所有的删除）")
	@RequestMapping(value = "/modifyHealthCare", method = RequestMethod.POST)
	@ResponseBody
	public String modifyHealthCare(@RequestParam long id,
@@ -83,7 +85,8 @@ public class PatientHealthRecordController extends WeixinBaseController {
	 * 运动强度查询接口
	 * @return
	 */
	@RequestMapping(value = "sports_type")
	@ApiOperation("运动强度查询接口")
	@RequestMapping(value = "sports_type", method ={ RequestMethod.POST, RequestMethod.GET})
	@ResponseBody
	public String sportsType() {
		try {
@@ -111,7 +114,8 @@ public class PatientHealthRecordController extends WeixinBaseController {
	 * 运动类型查询接口
	 * @return
	 */
	@RequestMapping(value = "sports")
	@ApiOperation("运动类型查询接口")
	@RequestMapping(value = "sports", method ={ RequestMethod.POST, RequestMethod.GET})
	@ResponseBody
	public String sports() {
		try {
@@ -139,8 +143,9 @@ public class PatientHealthRecordController extends WeixinBaseController {
	 * 查询药品列表
	 * @return
	 */
	@RequestMapping(value = "medicines")
	@RequestMapping(value = "medicines", method ={ RequestMethod.POST, RequestMethod.GET})
	@ResponseBody
	@ApiOperation("查询药品列表")
	public String medicines() {
		try {
			JSONArray array = new JSONArray();
@@ -171,8 +176,9 @@ public class PatientHealthRecordController extends WeixinBaseController {
	 * @param sports 运动类型标识
	 * @return
	 */
	@RequestMapping(value = "add_sports")
	@RequestMapping(value = "add_sports", method ={ RequestMethod.POST, RequestMethod.GET})
	@ResponseBody
	@ApiOperation("添加运动记录")
	public String addSports(String record_date, double sportsTime, String sportsType, String sports) {
		try {
			PatientHealthRecordSports record = new PatientHealthRecordSports();
@@ -201,8 +207,9 @@ public class PatientHealthRecordController extends WeixinBaseController {
	 * @param medicines_name 药品名称
	 * @return
	 */
	@RequestMapping(value = "add_medication")
	@RequestMapping(value = "add_medication", method ={ RequestMethod.POST, RequestMethod.GET})
	@ResponseBody
	@ApiOperation("添加用药记录")
	public String addMedication(String record_date, String medicines, String medicines_name) {
		try {
			PatientHealthRecordMedication record = new PatientHealthRecordMedication();
@@ -232,8 +239,9 @@ public class PatientHealthRecordController extends WeixinBaseController {
	 * @param images 图片HTTP地址，多图以逗号分隔
	 * @return
	 */
	@RequestMapping(value = "add_diet")
	@RequestMapping(value = "add_diet", method ={ RequestMethod.POST, RequestMethod.GET})
	@ResponseBody
	@ApiOperation("添加饮食记录接口")
	public String add(String record_date, String content, @RequestParam(required = false) String images) {
		try {
			PatientHealthRecordDiet record = new PatientHealthRecordDiet();
@@ -267,8 +275,9 @@ public class PatientHealthRecordController extends WeixinBaseController {
	 * 最近填写的运动、用药、饮食内容
	 * @return
	 */
	@RequestMapping(value = "recent")
	@RequestMapping(value = "recent", method ={ RequestMethod.POST, RequestMethod.GET})
	@ResponseBody
	@ApiOperation("最近填写的运动、用药、饮食内容")
	public String recent() {
		try {
//			JSONObject json = patientHealthRecordService.findRecentByPatient(getUID());
@@ -289,8 +298,9 @@ public class PatientHealthRecordController extends WeixinBaseController {
	 * @param pagesize 分页大小
	 * @return
	 */
	@RequestMapping(value = "list_sports")
	@RequestMapping(value = "list_sports", method ={ RequestMethod.POST, RequestMethod.GET})
	@ResponseBody
	@ApiOperation("运动记录查询接口")
	public String sports(String start,String end,int page, int pagesize) {
		try {
			Page<PatientHealthRecordSports> data = patientHealthRecordService.findSportsByPatientPage(getRepUID(), start,end,page, pagesize);
@@ -331,8 +341,9 @@ public class PatientHealthRecordController extends WeixinBaseController {
	 * @param pagesize 分页大小
	 * @return
	 */
	@RequestMapping(value = "list_medication")
	@RequestMapping(value = "list_medication", method ={ RequestMethod.POST, RequestMethod.GET})
	@ResponseBody
	@ApiOperation("用药记录查询接口")
	public String medication(String start,String end,int page, int pagesize) {
		try {
			Page<PatientHealthRecordMedication> data = patientHealthRecordService.findMedicalByPatientPage(getRepUID(), start, end, page, pagesize);
@@ -369,8 +380,9 @@ public class PatientHealthRecordController extends WeixinBaseController {
	 * @param pagesize 分页大小
	 * @return
	 */
	@RequestMapping(value = "list_diet")
	@RequestMapping(value = "list_diet", method ={ RequestMethod.POST, RequestMethod.GET})
	@ResponseBody
	@ApiOperation("饮食记录查询接口")
	public String diet(String start,String end,int page,int pagesize) {
		try {
			Page<PatientHealthRecordDiet> data = patientHealthRecordService.findDietByPatientPage(getRepUID(),start,end,page, pagesize);

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

@@ -7,6 +7,7 @@ import com.yihu.wlyy.service.app.account.DoctorInfoService;
import com.yihu.wlyy.service.app.hospital.HospitalService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +39,7 @@ public class HospitalController extends BaseController {
     */
    @RequestMapping(value = "getTownByCityCode")
    @ResponseBody
    @ApiOperation("根据市得到区")
    public String getTownByCityCode(String city) {
        try {
@@ -67,6 +69,7 @@ public class HospitalController extends BaseController {
     * @param town
     * @return
     */
    @ApiOperation("根据区得到机构")
    @RequestMapping(value = "getHositalByTownCode")
    @ResponseBody
    public String getHositalByTownCode(String town) {
@@ -104,6 +107,7 @@ public class HospitalController extends BaseController {
     */
    @RequestMapping(value = "/hospital_list")
    @ResponseBody
    @ApiOperation("机构列表")
    public String getHospitalList(
            @RequestParam(required = true) Integer type,
            @RequestParam(required = false) String query,
@@ -163,6 +167,7 @@ public class HospitalController extends BaseController {
     */
    @RequestMapping(value = "/doctor_list")
    @ResponseBody
    @ApiOperation("根据医院标识获取医生信息")
    public String getDoctorByHospital(
            @RequestParam(required = false) String hospital,
            @RequestParam(required = false) String query,

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

@@ -4,6 +4,7 @@ import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.service.app.account.DoctorInfoService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +35,7 @@ public class HospitalWithoutFilterController extends BaseController {
     */
    @RequestMapping(value = "/doctor_list")
    @ResponseBody
    @ApiOperation("根据医院标识获取医生信息(不走拦截器)")
    public String getDoctorByHospital(
            @RequestParam(required = false) String hospital,
            @RequestParam(required = false) String query,

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

@@ -3,6 +3,7 @@ package com.yihu.wlyy.web.patient.intervene;
import java.util.List;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +43,7 @@ public class PatientInterveneController extends BaseController {
	 */
	@RequestMapping(value = "inspection_list")
	@ResponseBody
	@ApiOperation("患者检查建议查询接口")
	public String inspection(long id, int pagesize) {
		try {
			Page<PatientInspectionSuggest> list = patientInspectionService.findSuggestByPatient(getUID(), id, pagesize);
@@ -74,6 +76,7 @@ public class PatientInterveneController extends BaseController {
	 */
	@RequestMapping(value = "self_exam_list")
	@ResponseBody
	@ApiOperation("查询指定患者的体测提醒")
	public String selfExamList(long id, int pagesize) {
		try {
			Page<PatientSelfInspection> list = patientInspectionService.findSelfExamByPatient(getUID(), id, pagesize);
@@ -105,6 +108,7 @@ public class PatientInterveneController extends BaseController {
	 */
	@RequestMapping(value = "self_exam_info")
	@ResponseBody
	@ApiOperation("查询体检提醒信息")
	public String selfExamInfo(String inspection) {
		try {
			List<PatientSelfInspectionItem> list = patientInspectionService.findSelfExamInfo(inspection);

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

@@ -3,6 +3,7 @@ package com.yihu.wlyy.web.patient.medical;
import java.util.List;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -42,6 +43,7 @@ public class PatientMedicalRecordController extends BaseController {
	 */
	@RequestMapping(value = "list")
	@ResponseBody
	@ApiOperation("查询患者病历记录列表")
	public String list(long id, int pagesize) {
		try {
			JSONArray array = new JSONArray();
@@ -77,6 +79,7 @@ public class PatientMedicalRecordController extends BaseController {
	 */
	@RequestMapping(value = "info")
	@ResponseBody
	@ApiOperation("查询病历记录明细")
	public String info(String record) {
		try {
			JSONObject jsonObject = new JSONObject();

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

@@ -6,6 +6,7 @@ import java.util.List;
import com.yihu.wlyy.entity.patient.SignFamily;
import com.yihu.wlyy.service.app.sign.FamilyContractService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
@@ -43,6 +44,7 @@ public class SchedulingController extends BaseController {
	 */
	@RequestMapping(value = "video_list")
	@ResponseBody
	@ApiOperation("获取医生视频预约排班信息")
	public String videoList(int days) {
		try {
			//查询患者签约信息

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/survey/PatientQuestionnaireController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 * Created by Reece on 2017/3/14.
 */
@Controller
@RequestMapping(value = "/patient/questionnaire",method = {RequestMethod.GET,RequestMethod.POST})
@RequestMapping(value = "/patient/questionnaire")
@Api(description = "居民端问卷调查")
public class PatientQuestionnaireController extends BaseController {
    @Autowired

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

@@ -1,6 +1,7 @@
package com.yihu.wlyy.web.patient.talk;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
@@ -23,6 +24,7 @@ public class PatientDiscussionGroupController extends BaseController {
	
	@RequestMapping(value = "consult")
	@ResponseBody
	@ApiOperation("得到讨论组")
	public String getConsultTalkGroup(@RequestParam(required = true)String consult){
		try{
			JSONObject object = talkGroupService.findConsultTalkGroup(consult);