Merge branch 'main' of suhaiwen/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -3489,8 +3489,14 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        if ("xm_ykyy_wx".equalsIgnoreCase(wxId)) {
            List<BasePatientWechatDo> ps = new ArrayList<BasePatientWechatDo>();
            if (StringUtils.isNotEmpty(outpatientId)){
                ps = basePatientWechatDao.findByWechatIdAndPatientId(wxId, outpatientDO.getPatient());
            }
            if (consultTeam!=null){
                ps = basePatientWechatDao.findByWechatIdAndPatientId(wxId, consultTeam.getPatient());
            }
            List<BasePatientWechatDo> ps = basePatientWechatDao.findByWechatIdAndPatientId(wxId, outpatientDO.getPatient());
            if (ps.isEmpty()) {
                logger.info("该用户" + outpatientDO.getPatientName() + "没有openid,无法推送模版消息，用户ID：" + outpatientDO.getPatient() + "wechatId:" + wxId);
                return;
@@ -3608,36 +3614,64 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        } else if ("xm_xzzx_wx".equalsIgnoreCase(wxId)) {
            String MsgUrl = "https://www.xmheart.com/ims-wx/index.html#/returnVisit/record?outpatientId=" + outpatientDO.getPatient();
            String MsgUrl ="";
            String responseMsg="";
            if(StringUtils.isNotEmpty(outpatientId)){
                MsgUrl = "https://www.xmheart.com/ims-wx/index.html#/returnVisit/record?outpatientId=" + outpatientDO.getPatient();
                responseMsg = xzzxEntranceService.sendXCXMes(wxId,
                        patientDO.getId(),
                        patientDO.getIdcard(),
                        first,
                        contentMsg,
                        remark,
                        MsgUrl,
                        "wx53f6bb4ac081d840");
            }
            if (consPatientDO!=null&&consultTeam!=null){
                MsgUrl = "https://www.xmheart.com/ims-wx/index.html#/returnVisit/record?outpatientId=" + consultTeam.getConsult();
                responseMsg = xzzxEntranceService.sendXCXMes(wxId,
                        consPatientDO.getId(),
                        consPatientDO.getIdcard(),
                        first,
                        contentMsg,
                        remark,
                        MsgUrl,
                        "wx53f6bb4ac081d840");
            }
            String responseMsg = xzzxEntranceService.sendXCXMes(wxId,
                    patientDO.getId(),
                    patientDO.getIdcard(),
                    first,
                    contentMsg,
                    remark,
                    MsgUrl,
                    "wx53f6bb4ac081d840");
            logger.info("XZZX_Msg_" + titelType + "=" + responseMsg);
        } else if ("xm_zsyy_wx".equalsIgnoreCase(wxId)) {
            String MsgUrl ="";
            String responseMsg="";
            if(StringUtils.isNotEmpty(outpatientId)){
                MsgUrl = "https://hlwyy.xmzsh.com/ims-wx/index.html#/returnVisit/record?outpatientId=" + outpatientDO.getPatient();
                responseMsg = entranceService.ehospitalNotice(
                        patientDO.getName(),
                        patientDO.getIdcard(),
                        patientDO.getMobile(),
                        first,
                        MsgUrl,
                        contentMsg,
                        remark
                );
            }
            if (consPatientDO!=null&&consultTeam!=null){
                MsgUrl = "https://hlwyy.xmzsh.com/ims-wx/index.html#/returnVisit/record?outpatientId=" + consultTeam.getConsult();
                responseMsg = entranceService.ehospitalNotice(
                        consPatientDO.getName(),
                        consPatientDO.getIdcard(),
                        consPatientDO.getMobile(),
                        first,
                        MsgUrl,
                        contentMsg,
                        remark
                );
            }
            if (consPatientDO!=null){
                MsgUrl = "https://hlwyy.xmzsh.com/ims-wx/index.html#/returnVisit/record?outpatientId=" + consPatientDO.getName();
            }
            String responseMsg = entranceService.ehospitalNotice(
                    patientDO.getName(),
                    patientDO.getIdcard(),
                    patientDO.getMobile(),
                    first,
                    MsgUrl,
                    contentMsg,
                    remark
            );
            logger.info("ZSYY_Msg" + titelType + "=" + responseMsg);
        }
    }