LAPTOP-KB9HII50\70708 1 rok temu
rodzic
commit
847e4a40e7

+ 17 - 2
business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@ -24,6 +24,7 @@ import com.yihu.jw.entity.hospital.message.BaseUserMessageDO;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.entity.hospital.prescription.WlyyConsultAdvice;
import com.yihu.jw.entity.hospital.prescription.WlyyConsultAdvice;
import com.yihu.jw.entity.hospital.prescription.WlyyOutpatientDO;
import com.yihu.jw.entity.hospital.prescription.WlyyOutpatientDO;
import com.yihu.jw.entity.knowledge.BaseSystemDialogSetting;
import com.yihu.jw.entity.order.BusinessOrderDO;
import com.yihu.jw.entity.order.BusinessOrderDO;
import com.yihu.jw.evaluate.score.dao.BaseEvaluateDao;
import com.yihu.jw.evaluate.score.dao.BaseEvaluateDao;
import com.yihu.jw.evaluate.score.dao.BaseEvaluateScoreDao;
import com.yihu.jw.evaluate.score.dao.BaseEvaluateScoreDao;
@ -45,6 +46,7 @@ import com.yihu.jw.im.dao.ConsultTeamDoctorDao;
import com.yihu.jw.im.dao.ConsultTeamLogDao;
import com.yihu.jw.im.dao.ConsultTeamLogDao;
import com.yihu.jw.im.util.ImUtil;
import com.yihu.jw.im.util.ImUtil;
import com.yihu.jw.im.util.ImageCompress;
import com.yihu.jw.im.util.ImageCompress;
import com.yihu.jw.knowledge.dao.BaseSystemDialogSettingDao;
import com.yihu.jw.order.dao.BusinessOrderDao;
import com.yihu.jw.order.dao.BusinessOrderDao;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.rehabilitation.ServiceItemPlanDao;
import com.yihu.jw.rehabilitation.ServiceItemPlanDao;
@ -110,7 +112,8 @@ public class ImService {
    @Autowired
    @Autowired
    private HospitalWaitingRoomDao hospitalWaitingRoomDao;
    private HospitalWaitingRoomDao hospitalWaitingRoomDao;
    @Autowired
    private BaseSystemDialogSettingDao dialogSettingDao;
    @Autowired
    @Autowired
    public ImUtil imUtil;
    public ImUtil imUtil;
@ -4134,9 +4137,21 @@ public class ImService {
        return imUtil.sendMessage(doctor, patientCode, "2", msg.toString());
        return imUtil.sendMessage(doctor, patientCode, "2", msg.toString());
    }
    }
    public boolean guidanceFinishConsult(String sessionId, String participants) {
    public boolean guidanceFinishConsult(String sessionId, String participants) {
        boolean flag = false;
        boolean flag = false;
        //发送导诊结束消息
        String systemType = "1";
        if (sessionId.endsWith("_26")){
            systemType = "2";
        }else if (sessionId.endsWith("_27")){
            systemType = "3";
        }
        BaseSystemDialogSetting endSetting =  dialogSettingDao.findBySystemTypeAndFunctionType(systemType,"5",1);
        if(endSetting!=null){
            String content = endSetting.getContent();
            BaseDoctorDO doctorDO = baseDoctorDao.findByIdAndDel(participants);
            imUtil.sendImMsg(participants, doctorDO.getName(), sessionId, "1", content, "1", null);
        }
        //踢出会员成员
        //踢出会员成员
        imUtil.deleteParticipants(sessionId, participants);
        imUtil.deleteParticipants(sessionId, participants);
        //修改session状态
        //修改session状态

+ 1 - 0
svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/im/ImOnlineGuidanceJob.java

@ -26,6 +26,7 @@ public class ImOnlineGuidanceJob implements Job {
            logger.info("onlineGuidance job start...");
            logger.info("onlineGuidance job start...");
            imJobService.onlineGuidance("18");
            imJobService.onlineGuidance("18");
            imJobService.onlineGuidance("26");
            imJobService.onlineGuidance("26");
            imJobService.onlineGuidance("27");
            logger.info("onlineGuidance job end.");
            logger.info("onlineGuidance job end.");
        }catch (Exception e){
        }catch (Exception e){
            e.printStackTrace();
            e.printStackTrace();

+ 9 - 3
svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/service/im/ImJobService.java

@ -39,8 +39,14 @@ public class ImJobService {
     */
     */
    public void onlineGuidance(String type){
    public void onlineGuidance(String type){
        //查找配置
        //查找配置
        String systemType = "1";
        if ("26".equals(type)){
            systemType = "2";
        }else if("27".equals(type)){
            systemType = "3";
        }
        WlyyHospitalSysDictDO dictDO = robotService.getSender();
        WlyyHospitalSysDictDO dictDO = robotService.getSender();
        BaseSystemDialogSetting customerSetting =  dialogSettingDao.findBySystemTypeAndFunctionType("1","3",1);
        BaseSystemDialogSetting customerSetting =  dialogSettingDao.findBySystemTypeAndFunctionType(systemType,"3",1);
        if(customerSetting!=null){
        if(customerSetting!=null){
            String content = customerSetting.getContent();
            String content = customerSetting.getContent();
            String time = timeTransfor(customerSetting.getTime(),customerSetting.getTimeUnit());
            String time = timeTransfor(customerSetting.getTime(),customerSetting.getTimeUnit());
@ -57,7 +63,7 @@ public class ImJobService {
                }
                }
            }
            }
        }
        }
        BaseSystemDialogSetting userSetting =  dialogSettingDao.findBySystemTypeAndFunctionType("1","4",1);
        BaseSystemDialogSetting userSetting =  dialogSettingDao.findBySystemTypeAndFunctionType(systemType,"4",1);
        if(userSetting!=null){
        if(userSetting!=null){
            String content = userSetting.getContent();
            String content = userSetting.getContent();
            String time = timeTransfor(customerSetting.getTime(),customerSetting.getTimeUnit());
            String time = timeTransfor(customerSetting.getTime(),customerSetting.getTimeUnit());
@ -75,7 +81,7 @@ public class ImJobService {
            }
            }
        }
        }
        BaseSystemDialogSetting endSetting =  dialogSettingDao.findBySystemTypeAndFunctionType("1","6",1);
        BaseSystemDialogSetting endSetting =  dialogSettingDao.findBySystemTypeAndFunctionType(systemType,"6",1);
        if(endSetting!=null){
        if(endSetting!=null){
            String content = endSetting.getContent();
            String content = endSetting.getContent();
            String time = timeTransfor(customerSetting.getTime(),customerSetting.getTimeUnit());
            String time = timeTransfor(customerSetting.getTime(),customerSetting.getTimeUnit());

+ 10 - 0
svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/web/quota/JobController.java

@ -14,6 +14,7 @@ import com.yihu.jw.job.dailyReport.DailyReportRemindJob;
import com.yihu.jw.job.dailyReport.DailyReportRemindSecondJob;
import com.yihu.jw.job.dailyReport.DailyReportRemindSecondJob;
import com.yihu.jw.job.dailyReport.DailyReportTotalRemindJob;
import com.yihu.jw.job.dailyReport.DailyReportTotalRemindJob;
import com.yihu.jw.job.dailyReport.DailyReportWsbTotalRemindJob;
import com.yihu.jw.job.dailyReport.DailyReportWsbTotalRemindJob;
import com.yihu.jw.job.im.ImOnlineGuidanceJob;
import com.yihu.jw.job.yk.YKYYDataUploadJob;
import com.yihu.jw.job.yk.YKYYDataUploadJob;
import com.yihu.jw.job.ykyy.UnCheckPrescriptionJob;
import com.yihu.jw.job.ykyy.UnCheckPrescriptionJob;
import com.yihu.jw.job.ykyy.UnSettledHISPrescriptionJob;
import com.yihu.jw.job.ykyy.UnSettledHISPrescriptionJob;
@ -370,6 +371,15 @@ public class JobController extends BaseController {
                        logger.info("DailyReportWsbTotalRemindJob  job exist");
                        logger.info("DailyReportWsbTotalRemindJob  job exist");
                    }
                    }
                    break;
                    break;
                case "im_online_guidance_job":
                    if (!quartzHelper.isExistJob("im_online_guidance_job")) {
                        String trigger = SystemConf.getInstance().getSystemProperties().getProperty("im_online_guidance_job");
                        quartzHelper.addJob(ImOnlineGuidanceJob.class, trigger, "im_online_guidance_job", new HashMap<>());
                        logger.info("im_online_guidance_job success");
                    } else {
                        logger.info("im_online_guidance_job exist");
                    }
                    break;
                default :
                default :
            }
            }
            return success("启动成功!");
            return success("启动成功!");