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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -853,7 +853,9 @@ public class FamilyContractService extends BaseService {
        message.setDel("1");
        message.setState(1);
        messageDao.save(message);
        if(messageService.getMessageNoticeSettingByMessageType(doctor,"1",MessageNoticeSetting.MessageTypeEnum.signSwitch.getValue())) {
            pushMsgTask.put(doctor, MessageType.MESSAGE_TYPE_DOCTOR_SIGN_WEB_RELIEVE.D_SW_02.name(), MessageType.MESSAGE_TYPE_DOCTOR_SIGN_WEB_RELIEVE.患者取消家庭签约.name(), "您有一条取消家庭签约消息，请查看。", patient);
        }
        return 200;
    }
@@ -912,6 +914,9 @@ public class FamilyContractService extends BaseService {
        message.setState(1);
        messageDao.save(message);
        if(messageService.getMessageNoticeSettingByMessageType(doctor,"1",MessageNoticeSetting.MessageTypeEnum.signSwitch.getValue())) {
            pushMsgTask.put(doctor, MessageType.MESSAGE_TYPE_DOCTOR_SIGN_WEB_RELIEVE.D_SW_02.name(), MessageType.MESSAGE_TYPE_DOCTOR_SIGN_WEB_RELIEVE.患者取消家庭签约.name(), "您有一条取消家庭签约消息，请查看。", patient);
        }
        return 200;
    }

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

@@ -131,7 +131,7 @@ public class MessageType {
	// 患者申请取消家庭签约消息
	public static enum MESSAGE_TYPE_DOCTOR_SIGN_WEB_RELIEVE {
		D_SW_02, 家庭签约, 患者申请解除家庭签约
		D_SW_02, 家庭签约, 患者取消家庭签约
	};
	// 医生申请取消家庭签约患者同意消息
@@ -177,4 +177,6 @@ public class MessageType {
		D_P_WRD, 续方消息, 待取药
	}
}