Merge branch 'srdev' of yeshijie/patient-co-management into srdev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/concern/ConcernService.java

@@ -4,13 +4,17 @@ import com.yihu.wlyy.entity.concern.ConcernDO;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.team.sign.DoctorTeam;
import com.yihu.wlyy.entity.doctor.team.sign.DoctorTeamMember;
import com.yihu.wlyy.entity.message.Message;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.repository.concern.ConcernDao;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.doctor.DoctorTeamDao;
import com.yihu.wlyy.repository.doctor.DoctorTeamMemberDao;
import com.yihu.wlyy.repository.message.MessageDao;
import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.task.PushMsgTask;
import com.yihu.wlyy.util.MessageType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -37,6 +41,10 @@ public class ConcernService extends BaseService {
    private DoctorTeamMemberDao doctorTeamDoctorDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private MessageDao messageDao;
    @Autowired
    private PushMsgTask pushMsgTask;
    /**
     * 新增患者关注医生
@@ -94,6 +102,27 @@ public class ConcernService extends BaseService {
        //更新医生关注人数+1
        Integer num=doctor.getConcernNum();
        doctor.setConcernNum(num+1);
        //消息
        String content = "您有一条新的关注消息！";
        Message message = new Message();
        message.setCzrq(new Date());
        message.setCreateTime(new Date());
        message.setRead(1);//设置未读
        message.setOver("1");
        message.setReceiver(doctorCode);
        message.setSender("system");
        message.setCode(getCode());
        message.setSenderName("系统");
        message.setTitle("居民"+patient.getName()+"关注了您");
        message.setContent(content);
        message.setType(14);
        message.setReadonly(1);//是否只读消息
        message.setDel("1");
        message.setRelationCode(patient.getCode());
        messageDao.save(message);
        pushMsgTask.put(doctorCode, MessageType.MESSAGE_TYPE_DOCTOR_ADD_CONCERN.D_CO_01.name(), MessageType.MESSAGE_TYPE_DOCTOR_ADD_CONCERN.关注医生.name(), content, patient.getCode());
        return true;
    }
@@ -138,6 +167,25 @@ public class ConcernService extends BaseService {
        //更新医生关注人数-1
        doctor.setConcernNum(doctor.getConcernNum()-1);
        //消息
        String content = "您有一条新的居民取消关注消息！";
        Message message = new Message();
        message.setCzrq(new Date());
        message.setCreateTime(new Date());
        message.setRead(1);//设置未读
        message.setOver("1");
        message.setReceiver(doctorCode);
        message.setSender("system");
        message.setCode(getCode());
        message.setSenderName("系统");
        message.setTitle("居民"+concern.getName()+"取消关注您");
        message.setContent(content);
        message.setType(15);
        message.setReadonly(1);//是否只读消息
        message.setDel("1");
        message.setRelationCode(concern.getPatient());
        messageDao.save(message);
        pushMsgTask.put(doctorCode, MessageType.MESSAGE_TYPE_DOCTOR_SUB_CONCERN.D_CO_02.name(), MessageType.MESSAGE_TYPE_DOCTOR_SUB_CONCERN.取消关注.name(), content, concern.getPatient());
    }
    /**

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/util/MessageType.java

@@ -177,4 +177,14 @@ public class MessageType {
		D_P_WRD, 续方消息, 待取药
	}
	// 关注
	public static enum MESSAGE_TYPE_DOCTOR_ADD_CONCERN {
		D_CO_01, 关注医生
	};
	// 取消关注
	public static enum MESSAGE_TYPE_DOCTOR_SUB_CONCERN {
		D_CO_02, 取消关注, 居民取消关注
	};
}