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

patient-co-service/wlyy_device/src/main/java/com/yihu/hos/device/service/AsyncService.java

@@ -244,14 +244,31 @@ public class AsyncService extends BaseService{
        if (signFamily != null) {
            healthDoctorFamily = signFamily.getDoctorHealth();
            doctorFamily = signFamily.getDoctor();
            if (StringUtils.isNotEmpty(healthDoctorFamily)) {
            if (StringUtils.isNotEmpty(healthDoctorFamily) && StringUtils.isNotEmpty(doctorFamily)){
                // 添加到消息接收人列表
                if (doctorFamily.equals(healthDoctorFamily)){
                    logger.info("-------------健管师和家医同一个人-------------");
                    receivers.add(healthDoctorFamily);
                }else {
                    logger.info("-------------健管师和家医不是同一个人-------------");
                    receivers.add(healthDoctorFamily);
                    receivers.add(doctorFamily);
                }
            }else if (StringUtils.isNotEmpty(healthDoctorFamily) && StringUtils.isEmpty(doctorFamily)){
                logger.info("-------------家医为空-------------");
                receivers.add(healthDoctorFamily);
            }else if (StringUtils.isNotEmpty(doctorFamily) && StringUtils.isEmpty(healthDoctorFamily)){
                logger.info("-------------健管师为空-------------");
                receivers.add(doctorFamily);
            }
            /*if (StringUtils.isNotEmpty(healthDoctorFamily)) {
                // 添加到消息接收人列表
                receivers.add(healthDoctorFamily);
            }
            if (StringUtils.isNotEmpty(doctorFamily)){
                // 添加到消息接收人列表
                receivers.add(doctorFamily);
            }
            }*/
        }
        // 查询病人三师签约中的健康管理师
        SignFamily signFamilySS = signFamilyDao.findBySanshiPatientYes(patientCode);