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

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

@@ -1649,7 +1649,7 @@ public class ConsultTeamService extends ConsultService {
     * @param type 1患者 2医生
     * @throws Exception
     */
    public void famousConsult(ConsultTeam ct, String uid, String type) throws Exception {
    public JSONObject famousConsult(ConsultTeam ct, String uid, String type) throws Exception {
        // 设置患者信息
        ct.setPatient(uid);
        String senderId = "";
@@ -1721,9 +1721,12 @@ public class ConsultTeamService extends ConsultService {
        }
        //设置消息ID
        ct.setStartMsgId(obj.getString("start_msg_id"));
        JSONObject object = ImUtill.getTopic(ct.getConsult());
        JSONArray array = new JSONArray(object.get("data").toString());
        consultTeamDao.save(ct);  // 保存医生咨询信息
        consultTeamDoctorDao.save(cd);
        consultDao.save(consult);
        return array.getJSONObject(0);
    }

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/team/AdminTeamService.java

@@ -338,21 +338,19 @@ public class AdminTeamService extends BaseService {
        JSONArray result = new JSONArray();
        SignFamily ssSign = signFamilyDao.findSignByPatient(patient, 1);
        SignFamily jtSign = signFamilyDao.findSignByPatient(patient, 2);
        if (ssSign != null&&ssSign.getAdminTeamId()!=null && (doctor.equals(ssSign.getDoctor())
                || doctor.equals(ssSign.getDoctorHealth()))) {
            AdminTeam team = getTeam(ssSign.getAdminTeamId());
            result.put(new JSONObject(team));
        }
        if (jtSign != null && (doctor.equals(jtSign.getDoctor())
        if (jtSign.getAdminTeamId()!=null&&jtSign != null && (doctor.equals(jtSign.getDoctor())
                || doctor.equals(jtSign.getDoctorHealth()))) {
            AdminTeam team = getTeam(jtSign.getAdminTeamId());
            if(ssSign == null || (long)ssSign.getAdminTeamId() != jtSign.getAdminTeamId()) {
                result.put(new JSONObject(team));
            }
        }
        return result;
    }

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

@@ -680,7 +680,7 @@ public class DoctorConsultController extends WeixinBaseController {
            consult.setVoice(voice);
            consult.setDoctor(doctorCode);//设置专科医生
            // 保存到数据库
            consultTeamService.famousConsult(consult, getUID(), "2");
            JSONObject result = consultTeamService.famousConsult(consult, getUID(), "2");
            // 推送消息给医生
            PushMsgTask.getInstance().put(consult.getDoctor(), MessageType.MESSAGE_TYPE_DOCTOR_NEW_FAMOUS_CONSULT_TEAM_DOCTOR.D_CT_04.name(), MessageType.MESSAGE_TYPE_DOCTOR_NEW_FAMOUS_CONSULT_TEAM_DOCTOR.名医咨询.name(), MessageType.MESSAGE_TYPE_DOCTOR_NEW_FAMOUS_CONSULT_TEAM_DOCTOR.您有新的名医咨询.name(), consult.getConsult());
            if (StringUtils.isNotEmpty(images)) {
@@ -689,7 +689,7 @@ public class DoctorConsultController extends WeixinBaseController {
                    PushMsgTask.getInstance().put(consult.getDoctor(), "2", MessageType.MESSAGE_TYPE_DOCTOR_NEW_FAMOUS_CONSULT_TEAM_DOCTOR.名医咨询.name(), MessageType.MESSAGE_TYPE_DOCTOR_NEW_FAMOUS_CONSULT_TEAM_DOCTOR.您有新的名医咨询.name(), img);
                }
            }
            return success("提交成功");
            return write(200,"创建成功！","data",result);
        } catch (Exception ex) {
            error(ex);
            return invalidUserException(ex, -1, "提交失败！");

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

@@ -400,13 +400,15 @@ public class ConsultController extends WeixinBaseController {
            consult.setVoice(voice);
            consult.setDoctor(doctorCode);//设置专科医生
            // 保存到数据库
            consultTeamService.famousConsult(consult, getUID(), "1");
            JSONObject object  = consultTeamService.famousConsult(consult, getUID(), "1");
            JSONObject resultConsult =  new JSONObject(consult);
            resultConsult.put("session_id",object.getString("session_id"));
            //名医咨询次数减一
            doctorWorkTimeService.setDoctorCurrentConsultTimesRemain(doctorCode);
            // 推送消息给医生
            PushMsgTask.getInstance().put(consult.getDoctor(), MessageType.MESSAGE_TYPE_DOCTOR_NEW_FAMOUS_CONSULT_TEAM.D_CT_03.name(), MessageType.MESSAGE_TYPE_DOCTOR_NEW_FAMOUS_CONSULT_TEAM.名医咨询.name(), MessageType.MESSAGE_TYPE_DOCTOR_NEW_FAMOUS_CONSULT_TEAM.您有新的名医咨询.name(), consult.getConsult());
            BusinessLogs.info(BusinessLogs.BusinessType.consult, getUID(), getUID(), new JSONObject(consult));
            return write(200, "提交成功", "data", consult);
            return write(200, "提交成功", "data", resultConsult);
        } catch (Exception ex) {
            error(ex);
            return invalidUserException(ex, -1, "提交失败！");