diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java
index 71b48ee..f10d1cf 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java
@@ -113,26 +113,21 @@ public enum SmsServiceEnums {
 
     /**
      * 只要子节点
-     * @param id
      * @return
      */
-    public static List<Map> getSmsServiceLeaf(int id)
+    public static List<Map> getSmsServiceLeaf()
     {
 
         List<Map> list = new ArrayList<>();
         for (SmsServiceEnums  e : SmsServiceEnums.values()) {
-            if(e.getPid() == id) {
                 Map rootMap = new HashMap();
                 rootMap.put("id",e.getId());
-                rootMap.put("name",e.getName());
+                rootMap.put("name", e.getName());
                 rootMap.put("pid", e.getPid());
                 if (!isLeaf(e.getId()))
                 {
                     list.add(rootMap);
                 }
-
-
-            }
         }
         return list;
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java
index 026f151..cce5b0d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java
@@ -233,11 +233,35 @@ public class EnumsController {
      */
     @RequestMapping(value = "/getSmsTypeByObjId/{serviceObjId}", method = RequestMethod.GET)
     @ResponseBody
-    public  List<Map> getAllServiceStatus(@PathVariable("serviceObjId") Integer serviceObjId) {
+    public  List<Map> getSmsTypeByObjId(@PathVariable("serviceObjId") Integer serviceObjId) {
         List<Map> list = SmsServiceEnums.getSmsServiceByServiceObj(serviceObjId);
         return  list;
     }
 
+
+    /**
+     * 获取查询页面的消息类型通过对象类型
+     * @param serviceObjId
+     * @return
+     */
+    @RequestMapping(value = "/getQuerySmsTypeByObjId/{serviceObjId}", method = RequestMethod.GET)
+    @ResponseBody
+    public  List<Map> getQuerySmsTypeByObjId(@PathVariable("serviceObjId") Integer serviceObjId) {
+        List<Map> list = null;
+        if (serviceObjId == 0)
+        {
+            list = SmsServiceEnums.getSmsServiceLeaf();
+        }
+        else
+        {
+            list = SmsServiceEnums.getSmsServiceByServiceObj(serviceObjId);
+        }
+
+        return  list;
+    }
+
+
+
     /**
      * 特殊日期类型查询
      * @param serviceObjId 服务对象
@@ -248,7 +272,7 @@ public class EnumsController {
     @RequestMapping(value = "/getSpecialType/{serviceObjId}/{sendDateType}/{freq}", method = RequestMethod.GET)
     @ResponseBody
     public  List<Map> getSpecialType(@PathVariable("serviceObjId") Integer serviceObjId,@PathVariable("sendDateType") Integer sendDateType,@PathVariable("freq") Integer freq) {
-        List<Map> list =SpecialDateEnums.getSpecialDateByServiceObj(serviceObjId, sendDateType,freq);
+        List<Map> list =SpecialDateEnums.getSpecialDateByServiceObj(serviceObjId, sendDateType, freq);
         return  list;
     }
 
@@ -262,7 +286,7 @@ public class EnumsController {
     @RequestMapping(value = "/getDateType/{serviceObjId}/{freq}", method = RequestMethod.GET)
     @ResponseBody
     public  List<Map> getDateType(@PathVariable("serviceObjId") Integer serviceObjId,@PathVariable("freq") Integer freq) {
-        List<Map> list =SendDateEnums.getSendFrequency(serviceObjId,freq);
+        List<Map> list =SendDateEnums.getSendFrequency(serviceObjId, freq);
         return  list;
     }
 
@@ -291,10 +315,9 @@ public class EnumsController {
 
     public static void main(String a[]) {
 
-        for (PatientsTypeEnum e : PatientsTypeEnum.values()) {
+        List list = SmsServiceEnums.getSmsServiceLeaf();
 
-            System.out.println(e.getText());
-        }
+            System.out.println(list);
     }
 
 }