Merge branch 'feature-refactor' of huangwenjie/im.doctor into feature-refactor

readme.md

@@ -182,6 +182,13 @@ REST API遵循REST最佳实践，规范命名URL中的每个部分。注意POST
            20、康复计划发送
            21、转诊待预约发送
            22、已知悉
            23、复诊说明
            24、诊断结果
            25、病情描述
            26、专家建议
            2102、上门服务-修改工单卡片信息
            2103、上门服务-变更工单医生信息
            2104、上门服务-变更工单服务项信息
    **会话类型** 
    
        sessions的type字段
@@ -203,10 +210,30 @@ REST API遵循REST最佳实践，规范命名URL中的每个部分。注意POST
            f、type =5 专科医生和家庭医生的固定组
            sessionId: 居民code+"_"+专科医生行政团队code
            
            #type =6 患者发起名医咨询 （使用率很低）
            sessionId: 
                
            #type =7 医生发起的名医咨询（已废弃）
            sessionId:
            g、type =8 续方咨询
            sessionId: 居民code+"_"+咨询code+"_"+咨询类型
            h、type =9 医院在线复诊
            sessionId: 居民code+"_"+咨询code+"_"+咨询类型
            i、type =10 医生发起的求助 （使用率很低）
            sessionId: 居民code+"_"+咨询code+"_"+咨询类型
            j、type =11 思明区上门护理
            sessionId: 居民code+"_"+咨询code+"_"+咨询类型
            k、type =12 候诊室群聊
            sessionId: 诊室code+"_"+咨询code+"_"+咨询类型
        sessions的business_type字段
        
            a、business_type =1 此会话不包含患者

src/server/endpoints/v2/topic.endpoint.js

@@ -42,7 +42,9 @@ router.get(APIv2.Sessions.Topic, function (req, res) {
    topic.getTopicByTopicId(topicId);
});
/**
 * 获取议题列表
 */
router.get(APIv2.Sessions.TopicList, function (req, res) {
    let user = req.query.user;
    let status = req.query.status;
@@ -55,6 +57,9 @@ router.get(APIv2.Sessions.TopicList, function (req, res) {
    topic.findAllByUserAndReplyAndStatus(users,reply,status,page,pagesize);
});
/**
 * 健康咨询
 */
router.get(APIv2.Sessions.HealthTopicList, function (req, res) {
    let user = req.query.user;
    let status = req.query.status;
@@ -67,6 +72,9 @@ router.get(APIv2.Sessions.HealthTopicList, function (req, res) {
    topic.findAllByUserAndReplyAndStatusHealthTopic(users,reply,status,page,pagesize);
});
/**
 * 按类型查找咨询（未回复，进行中，已回复）
 */
router.get(APIv2.Sessions.TopicListByType,function (req,res) {
    let user = req.query.user;
    let status = req.query.status;
@@ -84,6 +92,9 @@ router.get(APIv2.Sessions.TopicListByType,function (req,res) {
});
/**
 * 按类型查找咨询（未回复，进行中，已回复）的数量
 */
router.get(APIv2.Sessions.TopicListCountByType,function (req,res) {
    let user = req.query.user;
    let status = req.query.status;
@@ -99,6 +110,9 @@ router.get(APIv2.Sessions.TopicListCountByType,function (req,res) {
});
/**
 * 健康咨询(区分团队)
 */
router.get(APIv2.Sessions.HealthTeamTopicList, function (req, res) {
    let user = req.query.user;
    let status = req.query.status;
@@ -112,6 +126,9 @@ router.get(APIv2.Sessions.HealthTeamTopicList, function (req, res) {
    topic.findAllByUserAndReplyAndStatusHealthTeamTopic(users,reply,status,adminTeamCode,page,pagesize);
});
/**
 * 议题回复数统计
 */
router.get(APIv2.Sessions.TopicReplyCount, function (req, res) {
    let user = req.query.user;
    let status = req.query.status;
@@ -124,7 +141,9 @@ router.get(APIv2.Sessions.TopicReplyCount, function (req, res) {
});
/**
 * 创建议题
 */
router.post(APIv2.Sessions.Topics, function (req, res) {
    let payload = req.body;
    let testing = ObjectUtil.fieldsCheck(payload, "topic_id", "topic_name", "participants", "messages", "session_type");
@@ -136,6 +155,9 @@ router.post(APIv2.Sessions.Topics, function (req, res) {
    topic.createTopic(payload.topic_name, payload.topic_id, payload.session_id, JSON.parse(payload.participants), JSON.parse(payload.messages),payload.session_type);
});
/**
 * 修改议题
 */
router.put(APIv2.Sessions.Topics, function (req, res) {
    let payload = req.body;
    let topicId = payload.topic_id;
@@ -147,6 +169,9 @@ router.put(APIv2.Sessions.Topics, function (req, res) {
    topic.updateTopic(topicId, JSON.parse(jsonValue));
});
/**
 * 议题是否已结束，若top_id为current，则检查最后一个议题的状态
 */
router.get(APIv2.Sessions.TopicEnded, function (req, res) {
    let sessionId = req.params.session_id;
    let topicId = req.params.topic_id;
@@ -157,6 +182,9 @@ router.get(APIv2.Sessions.TopicEnded, function (req, res) {
    topic.isTopicEnded(sessionId, topicId, null);
});
/**
 *结束议题
 */
router.post(APIv2.Sessions.TopicEnded, function (req, res) {
    let payload = req.body;
    let endUser = payload.end_user;
@@ -169,7 +197,9 @@ router.post(APIv2.Sessions.TopicEnded, function (req, res) {
    ControllerUtil.regModelEventHandler(topic, res);
    topic.endTopic(topicId, endUser, endUserName,agent);
});
/**
 * 进入议题
 */
router.post(APIv2.Sessions.TopicInto, function (req, res) {
    let payload = req.body;
    let intoUser = payload.into_user;

src/server/include/endpoints.js

@@ -32,7 +32,7 @@ const APIv2 = {
        UserConsultTime:'/:user_id/consult/time'                        //用户咨询时间
    },
    Sessions: {
        Base: '/api/v2/sessions',
        Base: '/api/v2/sessions',                                       //创建会话
        Session: '/:session_id/session',                                // 获取会话
        SessionListByType: '/sessionListByType',                        // 按会话类型获取会话

src/server/models/socket.io/doctor.client.js

@@ -1,5 +1,5 @@
/**
 * 患者端socket.
 * 医生端socket.
 *
 * author: Sand
 * since: 2016/11/18