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

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/entity/synergy/ManageSynergyWorkorderDO.java

@@ -38,7 +38,7 @@ public class ManageSynergyWorkorderDO extends IdEntity {
    private String receiverType;//接收人类型（1、医生，2、客服）
    private String hospital;//创建人所属机构code；
    private String hospitalName;//创建人所属机构名称
    private Date receiveTime;//工单（客服管理员）接收时间
    private Date receiverTime;//工单（客服管理员）接收时间
    @Column(name = "code")
    public String getCode() {
@@ -256,12 +256,12 @@ public class ManageSynergyWorkorderDO extends IdEntity {
        this.hospitalName = hospitalName;
    }
    @Column(name = "receive_time")
    public Date getReceiveTime() {
        return receiveTime;
    @Column(name = "receiver_time")
    public Date getReceiverTime() {
        return receiverTime;
    }
    public void setReceiveTime(Date receiveTime) {
        this.receiveTime = receiveTime;
    public void setReceiverTime(Date receiverTime) {
        this.receiverTime = receiverTime;
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/synergy/SynergyManageService.java

@@ -260,6 +260,7 @@ public class SynergyManageService {
        map.put("remark", workorderDO.getRemark());
        map.put("createTime", workorderDO.getCreateTime());
        map.put("createUserName", workorderDO.getCreateUserName());
        map.put("hospitalName", workorderDO.getHospitalName());
        //获取服务对象
        if(StringUtils.isNotBlank(patient)){
@@ -268,7 +269,13 @@ public class SynergyManageService {
            map.put("servicerKey", workorderServicerDO.getServicePatientName());
            map.put("idcard", workorderServicerDO.getIdcard());
            map.put("ssc", workorderServicerDO.getSsc());
            map.put("completeTime", workorderServicerDO.getCompleteTime());
        }else {
            if(role == 3){
                //获取工单完成人数
                int count = workorderServicerDao.findByWorkorderCodeCount(workorderCode, 3);
                map.put("count", count);
            }
            map.put("servicerKey", workorderDO.getServicerKey());
            map.put("servicerCount", workorderDO.getServicerCount());
        }
@@ -282,8 +289,11 @@ public class SynergyManageService {
            map.put("status", "未接收");
        }
        //获取负责人信息
        if(role == 3){
            //普通客服显示接收者
            map.put("receiverName", workorderDO.getReceiverName());
            map.put("receiverTime", workorderDO.getReceiverTime());
            //获取负责人信息
            List<ManageSynergyWorkorderExecutorDO> managerList = workorderExecutorDao.findByWorkorderCode(workorderCode,1);
            List<ManageSynergyWorkorderExecutorDO> collaboratorList = workorderExecutorDao.findByWorkorderCode(workorderCode,2);
            String manager = managerList.size()>0 ? managerList.get(0).getExecutorName() : "";

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/survey/SurveyScreenResultService.java

@@ -1132,6 +1132,8 @@ public class SurveyScreenResultService extends BaseService {
            object.put("relationCodeName", templates.getTitle());
        }
        Doctor d = doctorService.findDoctorByCode(doctor);
        object.put("hospital", d.getHospital());
        object.put("hospitalName", d.getHospitalName());
        object.put("createUser", d.getCode());
        object.put("createUserName", d.getName());
        object.put("createUserType", 1);