Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

# Conflicts:
#	patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/specialty/index.jsp

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

@@ -157,4 +157,9 @@ public interface MessageDao extends PagingAndSortingRepository<Message, Long>, J
    @Query("select a from Message a where a.read = 1 and a.receiver = ?1 and a.state = 1 and a.type in (19,20,21,22,23) order by a.czrq desc")
    List<Message> getSpecialistUnRead(String receiver);
    @Query("update Message a set a.over = '0' where a.id = ?1")
    @Modifying
    int setSpecialistById(Long id);
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/message/MessageService.java

@@ -18,6 +18,7 @@ import com.yihu.wlyy.util.HttpClientUtil;
import com.yihu.wlyy.util.IdCardUtil;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
@@ -46,6 +47,8 @@ import java.util.*;
@Transactional(rollbackOn = Exception.class)
public class MessageService extends BaseService {
    private static org.slf4j.Logger logger = LoggerFactory.getLogger(MessageService.class);
    @Autowired
    private ConsultTeamDao consultTeamDao;
    @Autowired
@@ -67,6 +70,11 @@ public class MessageService extends BaseService {
    @Value("${im.im_list_get}")
    private String im_list_get;
    @Value("${specialist.url}")
    private String specialistUrl;
    @Autowired
    private HttpClientUtil httpClientUtil;
    /**
     * IM消息数量
     */
@@ -872,7 +880,7 @@ public class MessageService extends BaseService {
            JSONObject specialistObject = new JSONObject();
            specialistObject.put("title", specialist.get(0).getTitle());
            specialistObject.put("type", specialist.get(0).getType());
            specialistObject.put("msg", "您有"+specialist.size()+"个居民申请共管服务");
            specialistObject.put("msg", "您有"+specialist.size()+"个消息待处理，请查收");
            specialistObject.put("msgTime", DateUtil.dateToStrLong(specialist.get(0).getCreateTime()));
            specialistObject.put("relationCode",specialist.get(0).getRelationCode());
            specialistJson.put("specialist",specialistObject);
@@ -938,7 +946,7 @@ public class MessageService extends BaseService {
    public List<Message> getSpecialistUnTreated(Message message, Integer page, Integer size) throws Exception{
        // 排序
        Sort sort = new Sort(Sort.Direction.DESC, "read","over","createTime");
        Sort sort = new Sort(Sort.Direction.DESC, "createTime");
        // 分页信息
        Pageable pageRequest = new PageRequest(page - 1, size, sort);
@@ -984,6 +992,43 @@ public class MessageService extends BaseService {
    }
    /**
     * 设置待办消息已处理
     *
     * @param id
     * @param type
     */
    public int setSpecialistOver(Long id,Integer type){
        if (type == 22 || type==23){
            int result = 0;
            Message message = messageDao.findOne(id);
            String response = null;
            String url =/*specialistUrl*/"http://localhost:10051/" + "svr-specialist/selectByIds";
            Map<String,String> params = new HashMap<>();
            params.put("ids",message.getRelationCode());
            try {
                response = httpClientUtil.httpPost(url,params);
               com.alibaba.fastjson.JSONObject object = com.alibaba.fastjson.JSONObject.parseObject(response);
               if (object.getInteger("status") == 200){
                   JSONArray array = object.getJSONArray("obj");
                   Integer count = 0;
                   for (int i =0;i<array.size();i++){
                       if (array.getJSONObject(i).getInteger("status") == 1){
                           count = count+1;
                       }
                   }
                   if (count == array.size()){
                       result = messageDao.setSpecialistById(id);
                   }
               }
            }catch (Exception e){
                e.printStackTrace();
                logger.error(e.getMessage());
            }
            return result;
        }else {
           return messageDao.setSpecialistById(id);
        }
    }
}

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

@@ -730,4 +730,30 @@ public class DoctorMessageController extends BaseController {
        }
    }
    /**
     * 设置待办消息已处理
     *
     * @param id
     * @param type
     * @return
     */
    @RequestMapping(value = "setSpecialistOver",method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("设置待办消息已处理" )
    public String setSpecialistOver(@ApiParam(name = "id",value = "消息id")
                                 @RequestParam(value = "id")Long id,
                                    @ApiParam(name = "type",value = "消息类型")
                                    @RequestParam(value = "type")Integer type) {
        try {
            return write(200, "获取消息总数成功！", "data", messageService.setSpecialistOver(id,type));
        } catch (Exception e) {
            error(e);
            return error(-1, e.getMessage());
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/specialist/SpecialistEvaluate1Controller.java

@@ -0,0 +1,42 @@
package com.yihu.wlyy.web.doctor.specialist;/**
 * Created by nature of king on 2018/9/14.
 */
import com.yihu.wlyy.service.specialist.SpecialistEvaluateSevice;
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.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
/**
 * @author wangzhinan
 * @create 2018-09-14 0:09
 * @desc 医生评价
 **/
@RestController
@RequestMapping(value = "/doctor/specialist/evaluate", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "专科医生-医生评价")
public class SpecialistEvaluate1Controller extends BaseController {
    @Autowired
    private SpecialistEvaluateSevice specialistEvaluateSevice;
    /**
     * 医生获取评分
     * @return
     */
    @RequestMapping(value = "/selectByDoctor",method = RequestMethod.POST)
    @ApiOperation("医生获取评分")
    public String selectByDoctor(){
        try {
            return write(200,"获取成功","data",specialistEvaluateSevice.selectByDoctor(getUID()));
        }catch (Exception e){
            error(e);
            return error(-1,e.getMessage());
        }
    }
}