Merge branch 'master' of http://git.ius.plus/Project-Wing/WingCloudServer

Tools/Flyinsono.DBCopy.Tool/Service/MigrateService.BasicInfo.cs

@@ -29,7 +29,6 @@ namespace Flyinsono.DBCopy.Tool.Service
             var relationList = await MigrateReportPosterInfos();
             var orgDiagnosisModulesList = await MigrateTerminalsInfos(relationList);
             await MigrateOrganizationInfos(orgDiagnosisModulesList);
-            //await MigrateUserInfos();
             await MigrateReportTemplateInfos();
             await MigrateAdminInfos();
             Logger.WriteLineInfo($"Basic Infos Migrate Successfully");
@@ -476,6 +475,10 @@ namespace Flyinsono.DBCopy.Tool.Service
                         DiagnosisModule = moduleList,
                         IsDelete = organizationItem.IsDeleted
                     };
+                    if (!string.IsNullOrEmpty(model.ParentCode))
+                    {
+                        model.RootCode = model.ParentCode;
+                    }
                     //如果属于医联体则上级Code调整为统一上级集团,之前的上级调整为对接机构
                     foreach (var keyWord in medicalConsortiumKeys)
                     {

Tools/Flyinsono.DBCopy.Tool/Service/MigrateService.Course.cs

@@ -53,7 +53,7 @@ namespace Flyinsono.DBCopy.Tool.Service
             var courseStudentRecords = _coursesDBRepository.GetCourseStudents(courseStudentFilter).ToList();
 
             var pageIndex = 0;
-            var pageSize = 100;
+            var pageSize = 10;
             var coursesCount = coursesRecords.Count;
             while (true)
             {
@@ -294,12 +294,12 @@ namespace Flyinsono.DBCopy.Tool.Service
             var startTime = GetFactBeginTime(_migrateRecord.StartTime, _migrateRecord.EndTime);
             var endTime = _migrateRecord.EndTime;
             var builder = Builders<Video>.Filter;
-            var filter = builder.Where(x => (x.CreateTime > startTime && x.CreateTime <= endTime) || (x.UpdateTime > startTime && x.UpdateTime <= endTime));
+            var filter = builder.Where(x => ((x.CreateTime > startTime && x.CreateTime <= endTime) || (x.UpdateTime > startTime && x.UpdateTime <= endTime)));
             var videoRecords = _videoDBRepository.GetVideos(filter).OrderByDescending(x => x.CreateTime).ThenBy(x => x.Id).ToList();
             Logger.WriteLineInfo($"Video totalCount:{videoRecords.Count}");
 
             var pageIndex = 0;
-            var pageSize = 50;
+            var pageSize = 10;
             var videoCount = videoRecords.Count;
             while (true)
             {
@@ -383,7 +383,6 @@ namespace Flyinsono.DBCopy.Tool.Service
                                     catch (Exception et)
                                     {
                                         Logger.WriteLineWarn($"Send Video AddUserGroupAsync Error, ex:{et}");
-                                        continue;
                                     }
                                     if (addResult)
                                     {
@@ -433,6 +432,7 @@ namespace Flyinsono.DBCopy.Tool.Service
                         {
                             courseLabelCodes = LabelVideoRelationList.Where(c => c.VideoId == courseItem.Id)?.Select(c => c.LabelId)?.ToList() ?? new List<string>();
                         }
+                        var jpg = ConvertToJpg(courseItem.PosterToken);
                         var videoModel = new VideoMigratoryInfo()
                         {
                             Code = courseItem.Id,
@@ -440,7 +440,7 @@ namespace Flyinsono.DBCopy.Tool.Service
                             UpdateTime = courseItem.UpdateTime,
                             Name = courseItem.Title,
                             VideoToken = fileUrl,
-                            Poster = ConvertToJpg(courseItem.PosterToken),
+                            Poster = jpg,
                             Duration = courseItem.Duration,
                             VideoSize = courseItem.Size,
                             CreatorCode = courseItem.CreatorId,
@@ -460,7 +460,7 @@ namespace Flyinsono.DBCopy.Tool.Service
                             Name = courseItem.Title,
                             CourseIntro = courseItem.Description,
                             TeacherCode = courseItem.CreatorId,
-                            Poster = ConvertToJpg(courseItem.PosterToken),
+                            Poster = jpg,
                             Status = CourseStatusEnum.Approved,
                             StartTime = courseItem.CreateTime,
                             Duration = courseItem.Duration,
@@ -1344,7 +1344,7 @@ namespace Flyinsono.DBCopy.Tool.Service
             Logger.WriteLineInfo($"Questionnaires totalCount:{questionnairesRecords.Count}");
 
             var pageIndex = 0;
-            var pageSize = 100;
+            var pageSize = 10;
             var questionnairesCount = questionnairesRecords.Count;
             while (true)
             {
@@ -1581,7 +1581,7 @@ namespace Flyinsono.DBCopy.Tool.Service
             Logger.WriteLineInfo($"teachingTerminalDatasRecords totalCount:{teachingTerminalDatasRecords.Count}");
 
             var pageIndex = 0;
-            var pageSize = 100;
+            var pageSize = 10;
             var teachingTerminalDatasCount = teachingTerminalDatasRecords.Count;
             while (true)
             {
@@ -1654,6 +1654,7 @@ namespace Flyinsono.DBCopy.Tool.Service
                         else {
                             fileDataType = RemedicalFileDataTypeEnum.Image;
                         }
+                        var jpg = ConvertToJpg(teachingTerminalItem.PreviewImageFileToken);
                         var model = new RemoteExaminationDTO()
                         {
                             Code = teachingTerminalItem.Id,
@@ -1661,9 +1662,9 @@ namespace Flyinsono.DBCopy.Tool.Service
                             UpdateTime = teachingTerminalItem.UpdateTime,
                             Application = teachingTerminalItem.Application,
                             UserCode = teachingTerminalItem.OwnerId,
-                            PreviewUrl = ConvertToJpg(teachingTerminalItem.PreviewImageFileToken),
+                            PreviewUrl = jpg,
                             ImageUrl = defaultFile,
-                            CoverImageUrl = ConvertToJpg(teachingTerminalItem.PreviewImageFileToken),
+                            CoverImageUrl = jpg,
                             OriginImageUrl = GetSourceUrl(defaultFile) ,
                             FileDataType = fileDataType,
                             IsDelete = teachingTerminalItem.IsDeleted

Tools/Flyinsono.DBCopy.Tool/Service/Repositories/ConsultationRecordDBRepository.cs

@@ -8,6 +8,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using WingServerCommon.Mapper;
+using WingServerCommon.Utilities;
 
 namespace Flyinsono.DBCopy.Tool.Service.Repositories
 {
@@ -29,5 +30,45 @@ namespace Flyinsono.DBCopy.Tool.Service.Repositories
             var entities = LargerQuery(MongoDbClientSingle.Instance.ConsultationEvaluates, filter)?.ToList() ?? new List<ConsultationEvaluates>();
             return entities;
         }
+
+        /// <summary>
+        /// 新增随访记录
+        /// </summary>
+        /// <param name="consultationRecordId">会诊Id</param>
+        /// <param name="ids">病人名</param>
+        /// <param name="id">病人手机</param>
+        /// <returns></returns>
+        public void AddFollowUpVisitInfo(string consultationRecordId, IReadOnlyList<string> ids, string id)
+        {
+            try
+            {
+                var update1 = Builders<ConsultationRecords>.Update.Set(c => c.UpdateTime, DateTime.UtcNow);
+                MongoDbClientSingle.Instance.ConsultationRecords.UpdateOne(n => n.Id == consultationRecordId, update1);
+
+                var records = MongoDbClientSingle.Instance.FollowUpVisitInfos.Find(c => ids.Contains(c.Id))?.ToList();
+                if (records?.Count > 0)
+                {
+                    foreach (var item in records)
+                    {
+                        var update = Builders<ConsultationRecords>.Update.Set(x => x.CreateTime, DateTime.UtcNow).Set(c => c.UpdateTime, DateTime.UtcNow);
+                        MongoDbClientSingle.Instance.ConsultationRecords.UpdateOne(n => n.Id == item.ConsultationRecordId, update);
+                    }
+                }
+
+                records = MongoDbClientSingle.Instance.FollowUpVisitInfos.Find(c => c.Id == id)?.ToList();
+                if (records?.Count > 0)
+                {
+                    foreach (var item in records)
+                    {
+                        var updateRecord = Builders<ConsultationRecords>.Update.Set(c => c.UpdateTime, DateTime.UtcNow);
+                        MongoDbClientSingle.Instance.ConsultationRecords.UpdateOne(n => n.Id == item.ConsultationRecordId, updateRecord);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.WriteLineError($"AddFollowUpVisitInfo error {ex}");
+            }
+        }
     }
 }

src/appsettings.json

@@ -21,7 +21,7 @@
   },
   "Services": {
     "InProcess": "WingEmailModule,WingMongoDBModule,WingSessionModule,WingSMSModule,WingNotificationModule,WingAIDiagnosisService,WingRtcService,WingRtmpService",
-    "JsonRpcHttp": "WingManagementModule,WingStorageModule,WingUserModule,WingDeviceService,WingRemedicalModule,ReportService,WingLiveConsultationService,WingASRService,WingPaymentService,WingEducationService,WingLabService",
+    "JsonRpcHttp": "WingManagementModule,WingStorageModule,WingUserModule,WingDeviceService,WingRemedicalModule,ReportService,WingLiveConsultationService,WingASRService,WingEducationService,WingLabService",
     "Remote": ""
   },
   "SMS": {
@@ -36,7 +36,7 @@
     "DBName": "WingCloudDB",
     "ArchiveDeletionDays": 0,
     "InitMigrateBeginTime": "",
-    "InitMigrateEndTime": "2023-06-14"
+    "InitMigrateEndTime": "2023-06-17"
   },
   "DataCenterDB": {
     "Server": "127.0.0.1",