diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Form.cshtml
index 7c1cc3174..17e697f49 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Form.cshtml	
@@ -18,7 +18,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="VaccinationInfo">
         <div class="lr-form-item-title">疫苗类型</div>
-        <div id="VaccineType"></div>
+        <input id="VaccineType" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="VaccinationInfo">
         <div class="lr-form-item-title">第一针时间</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Form.js
index db719b6e8..522bf0a2b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Form.js	
@@ -15,7 +15,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#VaccineType').lrDataItemSelect({ code: 'VaccineType' });
+            //$('#VaccineType').lrDataItemSelect({ code: 'VaccineType' });
         },
         initData: function () {
             if (!!keyValue) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Index.cshtml
index d901b249f..07224363b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Index.cshtml	
@@ -31,8 +31,8 @@
                                     <div id="ClassNo"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">接种类型</div>
-                                    <div id="VaccineType"></div>
+                                    <div class="lr-form-item-title">疫苗类型</div>
+                                    <input id="VaccineType" type="text" class="form-control" />
                                 </div>
                             </div>
                         </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Index.js
index d1e183a34..a21dccf60 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Index.js	
@@ -16,7 +16,7 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#VaccineType').lrDataItemSelect({ code: 'VaccineType' });
+            //$('#VaccineType').lrDataItemSelect({ code: 'VaccineType' });
             $('#DeptNo').lrselect({
                 value: "deptno",
                 text: "deptname",
@@ -181,15 +181,15 @@ var bootstrap = function ($, learun) {
                     { label: "电话号码", name: "Mobile", width: 120, align: "left" },
                     {
                         label: "疫苗类型", name: "VaccineType", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'VaccineType',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
+                        //formatterAsync: function (callback, value, row, op, $cell) {
+                        //    learun.clientdata.getAsync('dataItem', {
+                        //        key: value,
+                        //        code: 'VaccineType',
+                        //        callback: function (_data) {
+                        //            callback(_data.text);
+                        //        }
+                        //    });
+                        //}
                     },
                     { label: "接种地", name: "VaccineAddress", width: 100, align: "left" },
                     {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoService.cs
index f2a09f89c..b137614c4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoService.cs	
@@ -1,4 +1,5 @@
 using Dapper;
+using Learun.Application.Organization;
 using Learun.DataBase.Repository;
 using Learun.Util;
 using System;
@@ -80,17 +81,26 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     }
                     if (!queryParam["VaccineType"].IsEmpty())
                     {
-                        dp.Add("VaccineType", queryParam["VaccineType"].ToString(), DbType.String);
-                        strSql.Append(" AND t.VaccineType =@VaccineType ");
+                        dp.Add("VaccineType", "%" + queryParam["VaccineType"].ToString() + "%", DbType.String);
+                        strSql.Append(" AND t.VaccineType  like  @VaccineType ");
                     }
                     if (!queryParam["Mobile"].IsEmpty())
                     {
                         dp.Add("Mobile", "%" + queryParam["Mobile"].ToString() + "%", DbType.String);
                         strSql.Append(" AND t.Mobile like  @Mobile ");
                     }
-                    if (login.Description == "教师")
+                    //if (login.Description == "教师")
+                    //{
+                    //    strSql.Append(" AND c.ClassDiredctorno = '" + login.account + "' ");
+                    //}
+                    //班主任查看自己班的学生数据
+                    var roleid = this.BaseRepository().FindEntity<RoleEntity>(a => a.F_FullName == "班主任")?.F_RoleId;
+                    if (!string.IsNullOrEmpty(roleid))
                     {
-                        strSql.Append(" AND c.ClassDiredctorno = '" + login.account + "' ");
+                        if (login.roleIds.Contains(roleid))
+                        {
+                            strSql.Append(" AND c.ClassDiredctorno = '" + login.account + "' ");
+                        }
                     }
                 }
                 else if (StuOrTeach == "1")