统计代码提交

patient-co-wlyy/src/main/java/com/yihu/wlyy/entity/consult/ConsultTeam.java

@@ -43,7 +43,6 @@ public class ConsultTeam extends IdEntity {
	private Long adminTeamId;//行政团队ID
	private Long guidance;   //关联指导
	private String doctorName;//醫生名字
	private String groupCode;//讨论租code
	//起始消息id
	private Integer startMsgId;
	//结束消息id
@@ -252,9 +251,6 @@ public class ConsultTeam extends IdEntity {
		this.guidance = guidance;
	}
	public String getGroupCode() {
		return groupCode;
	}
	public Integer getStartMsgId() {
		return startMsgId;
@@ -272,7 +268,4 @@ public class ConsultTeam extends IdEntity {
		this.endMsgId = endMsgId;
	}
	public void setGroupCode(String groupCode) {
		this.groupCode = groupCode;
	}
}

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

@@ -40,4 +40,7 @@ public interface DiscussionGroupDao extends PagingAndSortingRepository<WlyyTalkG
	List<WlyyTalkGroup> findByDoctorAndPatient(String doctor,String patient);
	
	WlyyTalkGroup findByCode(String code);
	@Query("from WlyyTalkGroup tg where tg.consultCode=?1  ")
	List<WlyyTalkGroup> findByConsult(String consult);
}

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

@@ -5,6 +5,7 @@
 *******************************************************************************/
package com.yihu.wlyy.service.app.consult;
import java.text.SimpleDateFormat;
import java.util.*;
import com.yihu.wlyy.entity.consult.Consult;
@@ -1181,4 +1182,5 @@ public class ConsultTeamService extends ConsultService {
    public void save(ConsultTeam consult) {
        consultTeamDao.save(consult);
    }
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/talk/TalkGroupService.java

@@ -361,7 +361,18 @@ public class TalkGroupService extends BaseService {
            throw new Exception("没有对应咨询讨论组");
        }
    }
    /**
     * 查询咨询对应讨论组
     *
     * @param consult
     * @return
     * @throws Exception
     */
    public List<WlyyTalkGroup> findAllConsultTalkGroup(String consult) throws Exception {
        List<WlyyTalkGroup> talkGroup = discussionGroupDao.findByConsult(consult);
       return talkGroup;
    }
    /**
     * 获取医生对应病人的讨论组纪录
     *

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

@@ -4,6 +4,7 @@ import java.util.List;
import java.util.Map;
import com.yihu.wlyy.entity.consult.Consult;
import com.yihu.wlyy.entity.discussion.WlyyTalkGroup;
import com.yihu.wlyy.entity.discussion.WlyyTalkGroupMember;
import com.yihu.wlyy.service.app.consult.ConsultService;
import com.yihu.wlyy.service.app.health.PatientHealthGuidanceService;
@@ -101,7 +102,7 @@ public class DoctorConsultController extends WeixinBaseController {
                json.put("name", consult.getName());
                // 设置醫生标识
                json.put("doctor", consult.getDoctor());
                Doctor doctor=doctorService.findDoctorByCode(consult.getDoctor());
                Doctor doctor = doctorService.findDoctorByCode(consult.getDoctor());
                // 设置醫生标识
                json.put("doctorName", doctor.getName());
                // 设置医生photo
@@ -143,7 +144,7 @@ public class DoctorConsultController extends WeixinBaseController {
    /**
     * 获取三师家庭咨询
     *
     * @param status 0未处理或未回复 1已回复 2已结束
     * @param status   0未处理或未回复 1已回复 2已结束
     * @param id
     * @param pagesize
     * @param patient
@@ -152,9 +153,9 @@ public class DoctorConsultController extends WeixinBaseController {
    @RequestMapping(value = "/list_by_status")
    @ResponseBody
    public String listByStatus(int status, int id, int pagesize,
                                      @RequestParam(required = false) String patient) {
                               @RequestParam(required = false) String patient) {
        try {
            Page<ConsultTeam> list = consultTeamService.findConsultByDoctor(getUID(),status,id, pagesize);
            Page<ConsultTeam> list = consultTeamService.findConsultByDoctor(getUID(), status, id, pagesize);
            JSONArray jsonArray = new JSONArray();
            for (ConsultTeam consult : list) {
                if (consult == null) {
@@ -197,8 +198,11 @@ public class DoctorConsultController extends WeixinBaseController {
                json.put("guidance", consult.getGuidance());
                json.put("startId", consult.getStartMsgId());
                json.put("endId", consult.getEndMsgId());
                json.put("groupCode", consult.getGroupCode());
                List<WlyyTalkGroup> wlyyTalkGroups= talkGroupService.findAllConsultTalkGroup(consult.getConsult());
                if(wlyyTalkGroups!=null&&wlyyTalkGroups.size()>0)
                for(WlyyTalkGroup wlyyTalkGroup:wlyyTalkGroups){
                    json.put("group"+wlyyTalkGroup.getType(),wlyyTalkGroup.getCode());
                }
                jsonArray.put(json);
            }
            return write(200, "查询成功", "list", jsonArray);
@@ -207,16 +211,17 @@ public class DoctorConsultController extends WeixinBaseController {
            return invalidUserException(e, -1, "查询失败！");
        }
    }
    @RequestMapping(value = "/hasTnvite")
    @ResponseBody
    public String hasTnvite(String groupCode) {
        try {
            JSONObject jo=new JSONObject();
            List<WlyyTalkGroupMember> wlyyTalkGroupMembers= talkGroupService.findTalkGroupMembers(groupCode);
            if(wlyyTalkGroupMembers.size()>2){
                jo.put("hasTnvite",1);//有邀请
            }else{
                jo.put("hasTnvite",0);//没邀请
            JSONObject jo = new JSONObject();
            List<WlyyTalkGroupMember> wlyyTalkGroupMembers = talkGroupService.findTalkGroupMembers(groupCode);
            if (wlyyTalkGroupMembers.size() > 2) {
                jo.put("hasTnvite", 1);//有邀请
            } else {
                jo.put("hasTnvite", 0);//没邀请
            }
            return write(200, "查询成功", "list", jo);
        } catch (Exception e) {
@@ -224,6 +229,7 @@ public class DoctorConsultController extends WeixinBaseController {
            return invalidUserException(e, -1, "查询失败！");
        }
    }
    /**
     * 名医列表
     *
@@ -307,30 +313,6 @@ public class DoctorConsultController extends WeixinBaseController {
        }
    }
    /**
     * 三师咨询转接接口
     *
     * @param consult 图咨询标识
     * @param doctor  转接对象标识 健康管理师转全科是 1个    全科转专科是多个  传多个doctor逗号分隔
     * @param type    转接对象类型，1三师团队，2指定医生，3工作组团队
     * @return
     */
    @RequestMapping(value = "transfer")
    @ResponseBody
    public String transfer(
            String consult,
            String doctor,
            @RequestParam(required = false) int type,
            String groupCode) {
        try {
            consultTeamService.transfers(getUID(), doctor, consult,groupCode);
            return success("转接成功");
        } catch (Exception e) {
            error(e);
            return error(-1, "转接失败！");
        }
    }
    /**
     * 结束三师咨询接口
     *
@@ -590,27 +572,29 @@ public class DoctorConsultController extends WeixinBaseController {
            return error(-1, "回复失败！");
        }
    }
    /**
     * 名医咨询添加接口
     * @param when 发病时间
     * @param symptoms 主要症状
     * @param images 图片URL地址，多图以逗号分隔
     * @param voice 语音URL地址
     *
     * @param when       发病时间
     * @param symptoms   主要症状
     * @param images     图片URL地址，多图以逗号分隔
     * @param voice      语音URL地址
     * @param doctorCode 名医的code
     * @return
     */
    @RequestMapping(value = "famousAdd")
    @ResponseBody
    public String famousAdd(
            @RequestParam(required = false)String when,
            @RequestParam(required = false) String when,
            String symptoms,
            @RequestParam(required = false) String doctorCode,
            @RequestParam(required = false) String images,
            @RequestParam(required = false) String voice) {
        try {
            //判断医生是否是在工作时间
            JSONObject jo=doctorWorkTimeService.isFamousDoctorWorking(doctorCode);
            if(!jo.get("status").equals("1")){
            JSONObject jo = doctorWorkTimeService.isFamousDoctorWorking(doctorCode);
            if (!jo.get("status").equals("1")) {
                return error(-1, jo.get("msg").toString());
            }
            if (StringUtils.isEmpty(images)) {
@@ -643,7 +627,7 @@ public class DoctorConsultController extends WeixinBaseController {
            consult.setVoice(voice);
            consult.setDoctor(doctorCode);//设置专科医生
            // 保存到数据库
            consultTeamService.addFamousTeamConsult(consult, getUID(),"2");
            consultTeamService.addFamousTeamConsult(consult, getUID(), "2");
            // 推送消息给医生
            PushMsgTask.getInstance().put(consult.getDoctor(), MessageType.MESSAGE_TYPE_DOCTOR_NEW_FAMOUS_CONSULT_TEAM.D_CT_01.name(), MessageType.MESSAGE_TYPE_DOCTOR_NEW_FAMOUS_CONSULT_TEAM.名医咨询.name(), MessageType.MESSAGE_TYPE_DOCTOR_NEW_FAMOUS_CONSULT_TEAM.您有新的名医咨询.name(), consult.getConsult());
            return success("提交成功");
@@ -662,10 +646,10 @@ public class DoctorConsultController extends WeixinBaseController {
    @RequestMapping(value = "/is_consult_unfinished", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    public String isExistsUnfinishedConsult(@RequestParam(required = false) String patient,
            @RequestParam(required = true) String doctor) {
                                            @RequestParam(required = true) String doctor) {
        try {
            JSONObject result = new JSONObject();
            List<ConsultTeam> consults = consultTeamService.getUnfinishedConsult(StringUtils.isEmpty(patient)?getUID():patient, doctor);
            List<ConsultTeam> consults = consultTeamService.getUnfinishedConsult(StringUtils.isEmpty(patient) ? getUID() : patient, doctor);
            if (consults != null && consults.size() > 0) {
                return write(200, "查询成功", "data", consults.get(0).getConsult());

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/discussion/DoctorDiscussionGroupController.java

@@ -41,13 +41,13 @@ public class DoctorDiscussionGroupController extends BaseController {
     * 医生创建讨论组
     *
     * @param name           讨论组名称
     * @param type           讨论组类型
     * @param type           讨论组类型 1咨询 2求组
     * @param talkDoctor     讨论组医生
     * @param talkDoctorName 讨论组医生名称
     * @param doctorType     成员医生类型
     * @param patient        病人标识
     * @param patientName    病人姓名
     * @param patientInclude 病人是否加入讨论组
     * @param patientInclude 病人是否加入讨论组 不传默认不加入患者
     * @return
     */
    @RequestMapping(value = "/create", method = {RequestMethod.GET, RequestMethod.POST})

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

@@ -308,11 +308,11 @@ public class ConsultController extends WeixinBaseController {
            Doctor doctor = doctorService.findDoctorByCode(consult.getDoctor());
            //创建咨询讨论组
            JSONObject jo= talkGroupService.createConsultTalkGroup(consult.getDoctor(), doctor.getName(), doctor.getHospital(), doctor.getHospitalName(),
                    consult.getPatient(), consult.getName(), consult.getConsult());
            consult.setGroupCode(jo.getString("groupCode"));
            // JSONObject jo= talkGroupService.createConsultTalkGroup(consult.getDoctor(), doctor.getName(), doctor.getHospital(), doctor.getHospitalName(),
            //        consult.getPatient(), consult.getName(), consult.getConsult());
            // consult.setGroupCode(jo.getString("groupCode"));
            //更新讨论组
            consultTeamService.save(consult);
            //consultTeamService.save(consult);
            // 添加到统计队列
            if (consult.getType() == 2) {
                DoctorStatisticsTask.getInstance(doctorStatisticsService).put(consult.getDoctor(), 1, 1, 0);