diff --git a/mainData/src/main/resources/mainOrm/MedKids.xml b/mainData/src/main/resources/mainOrm/MedKids.xml
index c57c0af..bd3e54e 100644
--- a/mainData/src/main/resources/mainOrm/MedKids.xml
+++ b/mainData/src/main/resources/mainOrm/MedKids.xml
@@ -126,7 +126,7 @@ select count(1) from med_kids
        A.VN_VACCINETYPE,
        CCC.CNT
   FROM med_InoculateRecord B
-    INNER JOIN med_Vaccineinfo C ON B.IC_VACCINEID=C.VI_ID AND C.ISDELETE=1
+    INNER JOIN med_Vaccineinfo C ON B.IC_VACCINEID=C.VI_ID
     INNER JOIN med_VaccineName A ON C.VI_VACCINENAMEID=A.VN_ID AND A.ISDELETE=1
     INNER JOIN MED_KIDS D ON B.IC_KIDID=D.KI_ID
     INNER JOIN (SELECT AA.VN_NAME,COUNT(DISTINCT b.column_value) AS CNT
diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/NotificationsController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/NotificationsController.java
index e9112af..eb52fa0 100644
--- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/NotificationsController.java
+++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/NotificationsController.java
@@ -45,13 +45,19 @@ public class NotificationsController extends BaseController{
     @TokenRequired
     public void getNotifications(HttpServletResponse response,
                                  HttpServletRequest request,
-                                 @RequestParam("time") long time){
+                                 @RequestParam("time") String time){
         //系统消息
         YmNotificationsQuery notificationsQuery = new YmNotificationsQuery();
         notificationsQuery.setYn(YnEnum.yes.getId());
         notificationsQuery.setSort("created desc");
 
-        notificationsQuery.setCreated(new Date(time*1000));
+        if (time==null){
+            ResultUtils.buildParameterErrorResultAndWrite(response);
+            return;
+        }
+        Long timeLong = Long.valueOf(time);
+
+        notificationsQuery.setCreated(new Date(timeLong*1000));
         List<YmNotifications> notificationsList = notificationsService.queryYmNotifications(notificationsQuery);
 
         List<Map> list = new ArrayList<>();
@@ -69,7 +75,7 @@ public class NotificationsController extends BaseController{
 
         //接种通知
 //        List inculateList = getInculateList(request);
-        List inculateList = getInculateList(request,time);
+        List inculateList = getInculateList(request,timeLong);
         if (CollectionUtils.isNotEmpty(inculateList)){
             list.addAll(inculateList);
         }