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

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

@@ -5,6 +5,7 @@ import java.util.Date;
import com.yihu.wlyy.aop.ObserverRequired;
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;
@@ -29,7 +30,7 @@ import com.yihu.wlyy.web.BaseController;
 * @author George
 */
@Controller
@RequestMapping(value = "/doctor/consult", produces = MediaType.APPLICATION_JSON_UTF8_VALUE,method = {RequestMethod.GET,RequestMethod.POST})
@RequestMapping(value = "/doctor/consult", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "电话咨询")
public class DoctorConsultMoviController extends BaseController {
@@ -44,7 +45,8 @@ public class DoctorConsultMoviController extends BaseController {
	 * @param pagesize 每页显示数，默认为10
	 * @return
	 */
	@RequestMapping(value = "movi_list")
	@ApiOperation("电话视频咨询列表查询")
	@RequestMapping(value = "movi_list",method = {RequestMethod.GET,RequestMethod.POST})
	@ResponseBody
	public String list(int type, String appoDate, int pagesize) {
		try {
@@ -103,7 +105,8 @@ public class DoctorConsultMoviController extends BaseController {
	 * @param consult 咨询标识
	 * @return
	 */
	@RequestMapping(value = "movi_info")
	@ApiOperation("根据code查询电话和视频详情")
	@RequestMapping(value = "movi_info",method = {RequestMethod.GET,RequestMethod.POST})
	@ResponseBody
	public String info(String code) {
		try {
@@ -148,7 +151,8 @@ public class DoctorConsultMoviController extends BaseController {
	 * @param consult 咨询标识
	 * @return
	 */
	@RequestMapping(value = "movi_finish")
	@ApiOperation("结束视频咨询")
	@RequestMapping(value = "movi_finish",method = {RequestMethod.GET,RequestMethod.POST})
	@ResponseBody
	@ObserverRequired
	public String finish(String code) {
@@ -211,7 +215,8 @@ public class DoctorConsultMoviController extends BaseController {
	 * @return
	 */
	@ResponseBody
	@RequestMapping(value = "referral")
	@RequestMapping(value = "referral",method = {RequestMethod.GET,RequestMethod.POST})
	@ApiOperation("视频转诊")
	@ObserverRequired
	public String referral(String doctor, String consult, String scheduling, String appo_date, int appo_week, String hour_begin, String hour_end, String content) {
		try {
@@ -266,7 +271,8 @@ public class DoctorConsultMoviController extends BaseController {
	 * @return
	 */
	@ResponseBody
	@RequestMapping(value = "inspect")
	@RequestMapping(value = "inspect",method = {RequestMethod.GET,RequestMethod.POST})
	@ApiOperation("添加检查检验接口")
	@ObserverRequired
	public String addInspect(String patient, String items) {
		try {

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

@@ -15,6 +15,7 @@ import com.yihu.wlyy.web.BaseController;
import com.yihu.wlyy.wechat.util.WeiXinAccessTokenUtils;
import com.yihu.wlyy.wechat.util.WeiXinOpenIdUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -35,7 +36,7 @@ import java.util.Date;
 *
 */
@Controller
@RequestMapping(value = "/doctor/consult/public", produces = MediaType.APPLICATION_JSON_UTF8_VALUE,method = {RequestMethod.GET,RequestMethod.POST})
@RequestMapping(value = "/doctor/consult/public", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "公共咨询")
public class DoctorConsultPublicController extends BaseController {
@@ -64,7 +65,8 @@ public class DoctorConsultPublicController extends BaseController {
	 * @param disease 疾病类型标识
	 * @return
	 */
	@RequestMapping(value = "list")
	@ApiOperation("查询公共咨询记录")
	@RequestMapping(value = "list",method =RequestMethod.POST)
	@ResponseBody
	public String list(@RequestParam(required = false) String disease, int type, long id, int pagesize) {
		try {
@@ -112,7 +114,8 @@ public class DoctorConsultPublicController extends BaseController {
	 * @param consult
	 * @return
	 */
	@RequestMapping(value = "info")
	@ApiOperation("查询咨询详细信息")
	@RequestMapping(value = "info",method =RequestMethod.POST)
	@ResponseBody
	public String info(String consult) {
		try {
@@ -153,7 +156,9 @@ public class DoctorConsultPublicController extends BaseController {
	 * @param pagesize 分页大小
	 * @return
	 */
	@RequestMapping(value = "reply_list")
	@ApiOperation("查询回复列表")
	@RequestMapping(value = "reply_list",method =RequestMethod.POST)
	@ResponseBody
	public String replyList(String consult, long id, int pagesize) {
		try {
@@ -205,7 +210,8 @@ public class DoctorConsultPublicController extends BaseController {
	 * @param images 图片URL，多图以逗号分隔
	 * @return
	 */
	@RequestMapping(value = "reply")
	@ApiOperation("回复公共咨询")
	@RequestMapping(value = "reply",method =RequestMethod.POST)
	@ResponseBody
	@ObserverRequired
	public String reply(String consult, String content, @RequestParam(required = false) String images) {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorEvaluateController.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;
@@ -26,7 +27,7 @@ import java.util.Map;
 * Created by 卓 on 2017/5/10.
 */
@Controller
@RequestMapping(value = "/doctor/consult/evaluate", produces = MediaType.APPLICATION_JSON_UTF8_VALUE,method = {RequestMethod.GET,RequestMethod.POST})
@RequestMapping(value = "/doctor/consult/evaluate", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "医生评价")
public class DoctorEvaluateController extends BaseController {
    @Autowired
@@ -40,7 +41,8 @@ public class DoctorEvaluateController extends BaseController {
     * @param consult 咨询
     * @return
     */
    @RequestMapping(value = "list")
    @ApiOperation("获取评价")
    @RequestMapping(value = "list",method = RequestMethod.GET)
    @ResponseBody
    public String list(@RequestParam(required = true,value="consult") String consult,@RequestParam(required = false,value="type") Integer type){
        try{
@@ -73,7 +75,8 @@ public class DoctorEvaluateController extends BaseController {
     * 获取去重的标签
     * @return
     */
    @RequestMapping(value = "label")
    @ApiOperation("获取去重的标签")
    @RequestMapping(value = "label",method = RequestMethod.POST)
    @ResponseBody
    public String label(){
        try{
@@ -92,7 +95,9 @@ public class DoctorEvaluateController extends BaseController {
     * @param size
     * @return
     */
    @RequestMapping(value = "getDoctorSorceList")
    @ApiOperation("获取去重的标签")
    @RequestMapping(value = "getDoctorSorceList",method = RequestMethod.POST)
    @ResponseBody
    public String getDoctorSorceList(@RequestParam(required = true)String type,
                                     @RequestParam(required = false)Integer page,
@@ -112,7 +117,9 @@ public class DoctorEvaluateController extends BaseController {
     * 获取医生各个类型评价数
     * @return
     */
    @RequestMapping(value = "getScoreListTitle")
    @ApiOperation("获取去重的标签")
    @RequestMapping(value = "getScoreListTitle",method = RequestMethod.POST)
    @ResponseBody
    public String  getScoreListTitle(){
        try{
@@ -130,7 +137,8 @@ public class DoctorEvaluateController extends BaseController {
     * 获取医生各个评分头部信息
     * @return
     */
    @RequestMapping(value = "getScoreTitle")
    @ApiOperation("获取去重的标签")
    @RequestMapping(value = "getScoreTitle",method = RequestMethod.POST)
    @ResponseBody
    public String getScoreTitle(){
        try{

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

@@ -31,7 +31,7 @@ import java.util.Map;
 *
 */
@Controller
@RequestMapping(value = "doctor/device", produces = MediaType.APPLICATION_JSON_UTF8_VALUE,method = {RequestMethod.GET,RequestMethod.POST})
@RequestMapping(value = "doctor/device", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(value = "患者设备管理--医生端", description = "患者设备管理--医生端")
public class DoctorDeviceController extends BaseController {
@@ -86,7 +86,7 @@ public class DoctorDeviceController extends BaseController {
	 * 设备删除
	 */
	@ApiOperation("设备删除--医生端")
	@RequestMapping(value = "DeletePatientDevice")
	@RequestMapping(value = "DeletePatientDevice",method = RequestMethod.POST)
	@ResponseBody
	@ObserverRequired
	public String delete(@ApiParam(name="id",value="删除设备关联ID")
@@ -128,7 +128,7 @@ public class DoctorDeviceController extends BaseController {
	 * 设备删除
	 */
	@ApiOperation("设备删除--管理端")
	@RequestMapping(value = "unbindDevice")
	@RequestMapping(value = "unbindDevice",method = {RequestMethod.POST,RequestMethod.GET})
	@ResponseBody
	@ObserverRequired
	public String deleteByAdmin(@ApiParam(name="deviceSn",value="设备SN")

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

@@ -15,6 +15,7 @@ import com.yihu.wlyy.service.app.consult.ConsultTeamService;
import com.yihu.wlyy.service.common.account.PatientService;
import com.yihu.wlyy.util.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -31,7 +32,7 @@ import com.yihu.wlyy.service.common.account.DoctorService;
import com.yihu.wlyy.web.BaseController;
@Controller
@RequestMapping(value = "/doctor/talkgroup", produces = MediaType.APPLICATION_JSON_UTF8_VALUE,method = {RequestMethod.GET,RequestMethod.POST})
@RequestMapping(value = "/doctor/talkgroup", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "医生端-讨论组")
public class DoctorDiscussionGroupController extends BaseController {
    // 医生服务类
@@ -59,7 +60,8 @@ public class DoctorDiscussionGroupController extends BaseController {
     * @param patientInclude 病人是否加入讨论组 不传默认不加入患者
     * @return
     */
    @RequestMapping(value = "/create", method = {RequestMethod.GET, RequestMethod.POST})
    @ApiOperation("医生创建讨论组")
    @RequestMapping(value = "/create", method =  RequestMethod.POST)
    @ResponseBody
    @ObserverRequired
    public String createTalkGroup(
@@ -219,6 +221,7 @@ public class DoctorDiscussionGroupController extends BaseController {
     * @param patientInclude 患者是否加入
     * @return
     */
    @ApiOperation("创建讨论组")
    @RequestMapping(value = "/create/members", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    @ObserverRequired
@@ -376,6 +379,7 @@ public class DoctorDiscussionGroupController extends BaseController {
     * @param cosnult
     * @return
     */
    @ApiOperation("获取查询对应的求助")
    @RequestMapping(value = "/group/consult", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    public String getConsultTalkGroup(@RequestParam(required = true) String cosnult) {
@@ -395,6 +399,7 @@ public class DoctorDiscussionGroupController extends BaseController {
     * @param cosnult
     * @return
     */
    @ApiOperation("获取查询对应的求助")
    @RequestMapping(value = "/group/patient_consult", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    public String getPatientConsultTalkGroup(@RequestParam(required = true) String cosnult) {
@@ -412,6 +417,7 @@ public class DoctorDiscussionGroupController extends BaseController {
     *
     * @return
     */
    @ApiOperation("获取常用医生")
    @RequestMapping(value = "/common_doctors", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    public String getCommonDoctors() {
@@ -434,7 +440,8 @@ public class DoctorDiscussionGroupController extends BaseController {
     * @param doctorType 医生类型
     * @return
     */
    @RequestMapping(value = "addmember", method = {RequestMethod.GET, RequestMethod.POST})
    @ApiOperation("添加讨论组成员")
    @RequestMapping(value = "addmember", method = RequestMethod.POST)
    @ResponseBody
    @ObserverRequired
    public String addTalkMember(
@@ -499,6 +506,7 @@ public class DoctorDiscussionGroupController extends BaseController {
     * @param members   讨论组成员[{"doctor":"xxx","doctorName":"xxx","doctorType":1}]
     * @return
     */
    @ApiOperation("添加成员")
    @RequestMapping(value = "/addmembers", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    @ObserverRequired
@@ -576,6 +584,7 @@ public class DoctorDiscussionGroupController extends BaseController {
     * @param memberCode 讨论组成员标识
     * @return
     */
    @ApiOperation("移除讨论组成员")
    @RequestMapping(value = "removemember", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    @ObserverRequired
@@ -597,6 +606,7 @@ public class DoctorDiscussionGroupController extends BaseController {
     * @param members
     * @return
     */
    @ApiOperation("移除成员")
    @RequestMapping(value = "/removemembers", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    @ObserverRequired
@@ -618,6 +628,7 @@ public class DoctorDiscussionGroupController extends BaseController {
     *
     * @return
     */
    @ApiOperation("获取医生讨论组")
    @RequestMapping(value = "mytalkgroups", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    public String getMyTalkGroup(
@@ -664,6 +675,7 @@ public class DoctorDiscussionGroupController extends BaseController {
     * @param groups
     * @return
     */
    @ApiOperation("查询讨论组签约量")
    @RequestMapping(value = "/group_sign", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    public String getMyTalkGroupSign(String groups) {
@@ -682,6 +694,7 @@ public class DoctorDiscussionGroupController extends BaseController {
     * @param groupCode
     * @return
     */
    @ApiOperation("根据讨论组查找咨询code")
    @RequestMapping(value = "/getConsultByGroupCode", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    public String getConsultByGroupCode(@RequestParam(required = false) String groupCode, @RequestParam(required = false) String consultCode) {
@@ -749,6 +762,7 @@ public class DoctorDiscussionGroupController extends BaseController {
     *
     * @return
     */
    @ApiOperation("获取讨论组成员列表")
    @RequestMapping(value = "groupmembers", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    public String getTalkGroupMembers(@RequestParam(required = true) String groupCode) {
@@ -792,6 +806,7 @@ public class DoctorDiscussionGroupController extends BaseController {
     * @param patient
     * @return
     */
    @ApiOperation("获取医生针对某个患者讨论组历史记录")
    @RequestMapping(value = "histories", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    public String getTalkGroupHistory(@RequestParam(required = true) String patient) {
@@ -809,6 +824,7 @@ public class DoctorDiscussionGroupController extends BaseController {
     * @param member
     * @return
     */
    @ApiOperation("查找与当前医生相关成员的讨论组")
    @RequestMapping(value = "related", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    public String getTalkGroupRelated(@RequestParam(required = true) String member, @RequestParam(required = false) String groupType) {
@@ -845,6 +861,7 @@ public class DoctorDiscussionGroupController extends BaseController {
     *
     * @return
     */
    @ApiOperation("查询医生讨论组数量")
    @RequestMapping(value = "count", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    public String getMyTalkGroupCount() {