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

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

@@ -1637,9 +1637,10 @@ public class ConsultTeamService extends ConsultService {
                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
                json.put("keyword1", sdf.format(new Date()));
                json.put("toUser", p.getCode());
                json.put("remark", "");
                json.put("consult",consult);
                json.put("first", name +"，您好！您有1条咨询已结束，请及时对咨询医生进行满意度评价。待办事项：满意度评价");
                PushMsgTask.getInstance().putWxMsg(accessTokenUtils.getAccessToken(), 16, openId, p.getName(), json);
                PushMsgTask.getInstance().putWxMsg(accessTokenUtils.getAccessToken(), 15, openId, p.getName(), json);
            }
        }
        JSONObject obj = ImUtill.endTopics(consultTeam.getPatient(), endId, endName, consultTeam.getConsult());

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

@@ -994,9 +994,10 @@ public class DoctorConsultController extends WeixinBaseController {
     */
    @RequestMapping(value = "finish_consult")
    @ResponseBody
    public String finishConsult(String consult) {
    public String finishConsult(@RequestParam(required = false) String consult) {
        try {
            int flag = consultTeamService.finishConsult(consult, getUID(), 2);
           // int flag = consultTeamService.finishConsult(consult, "test00000000005", 2);
            if (flag > 0) {
                return success("咨询已关闭");
            } else if(flag == -1) {