Merge branch 'master' of http://140.143.162.39:3000/shentun/peis

src/Shentun.Peis.Application/DataMigrations/BaseDataHandleAppService.cs

@@ -139,6 +139,7 @@ namespace Shentun.Peis.DataMigrations
         private readonly IRepository<SysParmValue> _sysParmValueRepository;
         private readonly IRepository<CollectItemType, Guid> _collectItemTypeRepository;
         private readonly IRepository<PatientRegisterExter> _patientRegisterExterRepository;
+        private readonly IRepository<AsbitemGuide> _asbitemGuideRepository;
 
         private Dictionary<string, string> veryPatientNo = new Dictionary<string, string>();
 
@@ -195,7 +196,8 @@ namespace Shentun.Peis.DataMigrations
             IRepository<SysParm> sysParmRepository,
             IRepository<SysParmValue> sysParmValueRepository,
             IRepository<CollectItemType, Guid> collectItemTypeRepository,
-            IRepository<PatientRegisterExter> patientRegisterExterRepository)
+            IRepository<PatientRegisterExter> patientRegisterExterRepository,
+            IRepository<AsbitemGuide> asbitemGuideRepository)
         {
             _deviceTypeRepository = deviceTypeRepository;
             _itemTypeRepository = itemTypeRepository;
@@ -250,6 +252,7 @@ namespace Shentun.Peis.DataMigrations
             _sysParmValueRepository = sysParmValueRepository;
             _collectItemTypeRepository = collectItemTypeRepository;
             _patientRegisterExterRepository = patientRegisterExterRepository;
+            _asbitemGuideRepository = asbitemGuideRepository;
         }
 
 
@@ -1125,6 +1128,19 @@ namespace Shentun.Peis.DataMigrations
 
                             #region 指引信息
 
+                            if (!string.IsNullOrWhiteSpace(row["prompt"].ToString()))
+                            {
+                                var asbitemGuideData = new AsbitemGuide
+                                {
+                                    AsbitemId = asbitemId,
+                                    ForSexId = ForSexFlag.All,
+                                    Guide = row["prompt"].ToString(),
+                                    MedicalCenterId = defaultMedicalCenterId
+                                };
+
+                                await _asbitemGuideRepository.InsertAsync(asbitemGuideData);
+                            }
+
                             #endregion
 
                             var fieldComparison = new FieldComparison

src/Shentun.Peis.Application/ItemResultTemplates/ItemResultTemplateAppService.cs

@@ -152,8 +152,6 @@ namespace Shentun.Peis.ItemResultTemplates
 
             var entlist = await Repository.GetListAsync(m => m.ItemId == ItemId);
 
-            var userList = await _userRepository.GetListAsync();
-
             var entdto = entlist.Select(s => new ItemResultTemplateDto
             {
                 CreationTime = s.CreationTime,