diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js
index e2a4f12d2..cf9c38a08 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js	
@@ -507,19 +507,63 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "乘火车区间", name: "TrainInterval", width: 100, align: "left", ishide: true,},
                     { label: "是否随迁子女", name: "IsTrailChildren", width: 100, align: "left" ,ishide: true, },
-                    { label: "生源地行政区划码", n联系电话ame: "StuPlaceCode", width: 100, align: "left" ,ishide: true, },
+                    { label: "生源地行政区划码", name: "StuPlaceCode", width: 100, align: "left" ,ishide: true, },
                     { label: "出生地行政区划码", name: "BirthPlaceCode", width: 100, align: "left" ,ishide: true, },
                     { label: "籍贯地行政区划码", name: "NativePlaceCode", width: 100, align: "left" ,ishide: true, },
                     { label: "所属派出所", name: "BelongPolice", width: 100, align: "left" ,ishide: true, },
                     { label: "户口所在地行政区划码", name: "ResidencePlaceCode", width: 100, align: "left" ,ishide: true, },
                     { label: "是否农户", name: "ResidenceNo", width: 100, align: "left" ,ishide: true, },
-                    { label: "学生居住地类型", name: "StuLivePlaceType", width: 100, align: "left" ,ishide: true, },
-                    { label: "健康状况", name: "HealthStatusNo", width: 100, align: "left" ,ishide: true, },
+                    {
+                        label: "学生居住地类型", name: "StuLivePlaceType", width: 100, align: "left" ,ishide: true,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StuLivePlaceType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "健康状况", name: "HealthStatusNo", width: 100, align: "left" ,ishide: true, 
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StuHealthType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     { label: "学生来源", name: "StuOrigin", width: 100, align: "left" ,ishide: true, },
                     { label: "招生对象", name: "RecruitObject", width: 100, align: "left" ,ishide: true, },
                     { label: "贫困户否建档立卡贫困户", name: "PoorIsRecord", width: 100, align: "left" ,ishide: true, },
-                    { label: "招生方式", name: "RecruitWay", width: 100, align: "left" ,ishide: true, },
-                    { label: "联招合作类型", name: "RecruitCooperateType", width: 100, align: "left" ,ishide: true, },
+                    {
+                        label: "招生方式", name: "RecruitWay", width: 100, align: "left" ,ishide: true,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'RecruitWay',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "联招合作类型", name: "RecruitCooperateType", width: 100, align: "left" ,ishide: true,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'RecruitCooperateType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     { label: "准考证号", name: "AdmissionNo", width: 100, align: "left" ,ishide: true, },
                     { label: "考生号", name: "ksh", width: 100, align: "left" ,ishide: true, },
                     { label: "考试总分", name: "ExamScore", width: 100, align: "left" ,ishide: true, },
@@ -530,25 +574,123 @@ var bootstrap = function ($, learun) {
                     { label: "家庭邮政编码", name: "PostalCode", width: 100, align: "left" ,ishide: true, },
                     { label: "其他联系方式", name: "OtherContact", width: 100, align: "left" ,ishide: true, },
                     { label: "成员1姓名", name: "OneName", width: 100, align: "left" ,ishide: true, },
-                    { label: "成员1关系", name: "OneMembership", width: 100, align: "left" ,ishide: true, },
+                    {
+                        label: "成员1关系", name: "OneMembership", width: 100, align: "left" ,ishide: true,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'GuardianType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     { label: "成员1是否监护人", name: "OneIsGuardian", width: 100, align: "left" ,ishide: true, },
                     { label: "成员1联系电话", name: "PieceCultivateWay", width: 100, align: "left" ,ishide: true, },
-                    { label: "成员1出生年月", name: "OneBirthday", width: 100, align: "left" ,ishide: true, },
-                    { label: "成员1身份证件类型", name: "OneIdCardType", width: 100, align: "left" ,ishide: true, },
+                    {
+                        label: "成员1出生年月", name: "OneBirthday", width: 100, align: "left" ,ishide: true, 
+                        formatter: function (value) {
+                            return learun.formatDate(value, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: "成员1身份证件类型", name: "OneIdCardType", width: 100, align: "left" ,ishide: true,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'IdCardType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     { label: "成员1身份证件号", name: "OneIdCardNo", width: 100, align: "left" ,ishide: true, },
-                    { label: "成员1民族", name: "OneNationalityNo", width: 100, align: "left" ,ishide: true, },
-                    { label: "成员1健康状况", name: "OneHealthStatus", width: 100, align: "left" ,ishide: true, },
+                    {
+                        label: "成员1民族", name: "OneNationalityNo", width: 100, align: "left" ,ishide: true, 
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'National',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "成员1健康状况", name: "OneHealthStatus", width: 100, align: "left" ,ishide: true,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'EpiHealth',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     { label: "成员1工作或学习单位", name: "OneJob", width: 100, align: "left" ,ishide: true, },
                     { label: "成员2职务", name: "TwoPosition", width: 100, align: "left" ,ishide: true, },
                     { label: "成员2姓名", name: "TwoName", width: 100, align: "left" ,ishide: true, },
-                    { label: "成员2关系", name: "TwoMembership", width: 100, align: "left" ,ishide: true, },
+                    {
+                        label: "成员2关系", name: "TwoMembership", width: 100, align: "left" ,ishide: true,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'GuardianType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     { label: "成员2是否监护人", name: "TwoIsGuardian", width: 100, align: "left" ,ishide: true, },
                     { label: "成员2联系电话", name: "PieceCultivateWay", width: 100, align: "left" ,ishide: true, },
-                    { label: "成员2出生年月", name: "TwoBirthday", width: 100, align: "left" ,ishide: true, },
-                    { label: "成员2身份证件类型", name: "TwoIdCardType", width: 100, align: "left" ,ishide: true, },
+                    {
+                        label: "成员2出生年月", name: "TwoBirthday", width: 100, align: "left" ,ishide: true,
+                        formatter: function (value) {
+                            return learun.formatDate(value, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: "成员2身份证件类型", name: "TwoIdCardType", width: 100, align: "left" ,ishide: true,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'IdCardType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     { label: "成员2身份证件号", name: "TwoIdCardNo", width: 100, align: "left" ,ishide: true, },
-                    { label: "成员2民族", name: "TwoNationalityNo", width: 100, align: "left" ,ishide: true, },
-                    { label: "成员2健康状况", name: "TwoHealthStatus", width: 100, align: "left" ,ishide: true, },
+                    {
+                        label: "成员2民族", name: "TwoNationalityNo", width: 100, align: "left" ,ishide: true,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'National',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "成员2健康状况", name: "TwoHealthStatus", width: 100, align: "left" ,ishide: true,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'EpiHealth',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     { label: "成员2工作或学习单位", name: "TwoJob", width: 100, align: "left" ,ishide: true, },
                     { label: "成员2职务", name: "TwoPosition", width: 100, align: "left" ,ishide: true, },