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

patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/consult/ConsultTeamLogDao.java

@@ -1,16 +1,22 @@
/*******************************************************************************
 * Copyright (c) 2005, 2014 springside.github.io
 *
 * <p>
 * Licensed under the Apache License, Version 2.0 (the "License");
 *******************************************************************************/
package com.yihu.wlyy.repository.consult;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import com.yihu.wlyy.entity.consult.ConsultTeamLog;
import java.util.List;
public interface ConsultTeamLogDao extends PagingAndSortingRepository<ConsultTeamLog, Long>, JpaSpecificationExecutor<ConsultTeamLog> {
    int countByConsult(String consult);
    @Query(" from ConsultTeamLog a where a.consult = ?1 ")
    List<ConsultTeamLog> getConsultLogByConsultLog(String consultCode);
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/patient/PatientDao.java

@@ -1,3 +1,4 @@
/*******************************************************************************
 * Copyright (c) 2005, 2014 springside.github.io
 *

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -1214,4 +1214,12 @@ public class ConsultTeamService extends ConsultService {
    public ConsultTeam findByConsultCode(String consultCode) {
        return consultTeamDao.findByConsult(consultCode);
    }
    /**
     * @param consultCode
     * @return
     */
    public List<ConsultTeamLog> getConsultLog(String consultCode) {
        return consultTeamLogDao.getConsultLogByConsultLog(consultCode);
    }
}

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

@@ -503,7 +503,7 @@ public class WechatController extends WeixinBaseController {
    /**
     * 获取签名signature
     *
     * @param pageUrl需要签名的页面全地址（？后的也需要除了#后的不需要）
     * @param pageUrl 需要签名的页面全地址（？后的也需要除了#后的不需要）
     * @return
     */
    @RequestMapping(value = "getSign")
@@ -536,7 +536,7 @@ public class WechatController extends WeixinBaseController {
    /**
     * 发送微信签约成功的消息
     *
     * @param code患者编号
     * @param code 患者编号
     * @return
     */
    @RequestMapping(value = "sendSign")

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

@@ -710,4 +710,41 @@ public class DoctorConsultController extends WeixinBaseController {
            return error(-1, "转接失败！");
        }
    }
    /**
     * 根据咨询code获取咨询的log
     *
     * @param consultCode
     * @return
     */
    @RequestMapping(value = "getConsultLog")
    @ResponseBody
    public String getConsultLog(
            String consultCode) {
        try {
            List<ConsultTeamLog> consultTeamLogs = consultTeamService.getConsultLog(consultCode);
            JSONArray ja = new JSONArray();
            for (ConsultTeamLog log : consultTeamLogs) {
                JSONObject json = new JSONObject();
                json.put("id", log.getId());
                // 设置回复内容
                json.put("content", log.getContent());
                // 设置回复医生姓名
                json.put("doctorName", log.getDoctorName());
                // 设置回复人头像
                json.put("photo", log.getPhoto());
                // 设置日志类型
                json.put("type", log.getType());
                // 设置记录类型
                json.put("chatType", log.getChatType());
                // 设置咨询或回复时间
                json.put("time", DateUtil.dateToStr(log.getCzrq(), DateUtil.YYYY_MM_DD_HH_MM_SS));
                ja.put(json);
            }
            return success("转接成功");
        } catch (Exception e) {
            error(e);
            return error(-1, "转接失败！");
        }
    }
}