Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

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

@@ -856,7 +856,7 @@ public class XzzxEntranceService {
        logger.info("ehospitalNotice:");
        BasePatientDO patientDO = basePatientDao.findByIdcardAndDel(idCard,"1");
        if(patientDO!=null&&StringUtils.isNotBlank(patientDO.getIdcard())){
            sendXCXMes("xm_xzzx_wx",patientDO.getId(),null,content,contentString,"",url,"");
            sendMes("xm_xzzx_wx",patientDO.getId(),null,content,contentString,"",url);
        }
        return "-2";
    }