diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index f4b9853..86e3558 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -660,7 +660,9 @@ public class BabyBookbuildingFacade {
                 return br;
             }
             //创建建档短信
-            createBuildSms(model);
+            //createBuildSms(model);
+
+            createBuildMsg(model);
 
             br.setErrorcode(ErrorCodeConstants.SUCCESS);
             br.setErrormsg("成功");
@@ -768,7 +770,7 @@ public class BabyBookbuildingFacade {
 
             if (CollectionUtils.isNotEmpty(sendList)) {
                 //短信前缀
-                String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, babyModel.getBuildDoctor());
+                String messagePrefix = smsConfigFacade.getMsgPrefix(configModel, babyModel.getBuildDoctor(),ServiceObjEnums.BABYOBJ.getId());
                 for (SmsTemplateModel templateModel : sendList) {
                     if (templateModel != null && templateModel.getStatus() == 1) {
                         ExceptionUtils.catchException("The child build status is opened.;" + babyModel.getMphone() + ";name=" + babyModel.getName());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index aa8f72f..ad849c7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -462,7 +462,9 @@ public class BookbuildingFacade {
 
         if (type == ServiceObjEnums.YUNOBJ.getId()) {
             //生成建档短信
-            createBuildSms(p);
+//            createBuildSms(p);
+
+            createBuildMsg(p);
         }
 
 
@@ -567,7 +569,7 @@ public class BookbuildingFacade {
             if (CollectionUtils.isNotEmpty(sendList)) {
 
                 //短信前缀
-                String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, patient.getBookbuildingDoctor());
+                String messagePrefix = smsConfigFacade.getMsgPrefix(configModel, patient.getBookbuildingDoctor(), ServiceObjEnums.YUNOBJ.getId());
                 for (SmsTemplateModel templateModel : sendList) {
                     if (templateModel != null && templateModel.getStatus() == 1) {
                         com.lyms.platform.beans.MessageListRequest smsList = new  com.lyms.platform.beans.MessageListRequest();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
index 2c42636..f119546 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
@@ -814,6 +814,74 @@ public class SmsConfigFacade {
 	}
 
 
+
+	/**
+	 * 获取发送短信的前缀 如果配置为发送科室前缀 就通过医生查询到医生所在科室
+	 * 然后取对应科室前缀 如果为空就取医院前缀
+	 * @return
+	 */
+	public String getMsgPrefix(SmsConfigModel config,String doctorId,int objType)
+	{
+		String prefix = "";
+		//是否收费，孕妇，儿童，产妇 {"pregnant":"true","baby":"false","puerperant":"true"}
+		if (StringUtils.isNotEmpty(config.getIsCharge()))
+		{
+			prefix = config.getAreaPrefix();
+			String isCharge = config.getIsCharge();
+			Map<String,String> chargeMap = JsonUtil.getMap(isCharge);
+			if (chargeMap != null && chargeMap.size() > 0)
+			{
+				//孕妇
+				if (objType == ServiceObjEnums.YUNOBJ.getId())
+				{
+					String pregnant = chargeMap.get("pregnant");
+					if (StringUtils.isNotEmpty(pregnant) && "true".equals(pregnant))
+					{
+						prefix =  getPrefix(config,doctorId);
+					}
+				}
+				//儿童
+				else if (objType == ServiceObjEnums.BABYOBJ.getId())
+				{
+					String baby = chargeMap.get("baby");
+					if (StringUtils.isNotEmpty(baby) && "true".equals(baby))
+					{
+						prefix =  getPrefix(config,doctorId);
+					}
+				}
+				//产妇
+				else if (objType == ServiceObjEnums.CHANOBJ.getId())
+				{
+					String puerperant = chargeMap.get("puerperant");
+					if (StringUtils.isNotEmpty(puerperant) && "true".equals(puerperant))
+					{
+						prefix =  getPrefix(config,doctorId);
+					}
+				}
+			}
+		}
+		return prefix;
+	}
+
+	/**
+	 * 获取医院前缀或者可是前缀
+	 * @param config
+	 * @param doctorId
+	 * @return
+	 */
+	private String getPrefix(SmsConfigModel config,String doctorId)
+	{
+		String  messagePrefix = config.getHospitalPrefix();
+		//前缀类型 0医院前缀 1科室前缀
+		if (config.getPrefixType() != null && config.getPrefixType() == 1)
+		{
+			String res = getDeptPrefix(doctorId, config.getDeptPrefix());
+			messagePrefix = res == "" ? messagePrefix : res;
+		}
+		return messagePrefix;
+	}
+
+
 	/**
 	 * 获取发送短信的前缀 如果配置为发送科室前缀 就通过医生查询到医生所在科室
 	 * 然后取对应科室前缀 如果为空就取医院前缀