添加日志

src/VitalMixtureService/DBService/DBAutoMapperProfile.cs

@@ -347,7 +347,9 @@ namespace VitalServer
             CreateMap<PopulationFinishStatisticsEntity, PopulationFinishStatisticsDTO>().ReverseMap();
 			
             CreateMap<FacturyUserDTO, FacturyUserEntity>().ReverseMap();
+            CreateMap<PageCollection<FacturyUserDTO>, PageCollection<FacturyUserEntity>>().ReverseMap();
             CreateMap<FacturyPostHistoryDTO, FacturyPostHistoryEntity>().ReverseMap();
+            CreateMap<PageCollection<FacturyPostHistoryDTO>, PageCollection<FacturyPostHistoryEntity>>().ReverseMap();
 		}
 	}
 }

src/VitalMixtureService/Factury/JingQiApiHelper.cs

@@ -35,10 +35,10 @@ namespace VitalService.Factury
         /// <param name="request"></param>
         /// <param name="headers"></param>
         /// <returns></returns>
-        public async Task<JingQiResult<JingQiExamRegisterResult>> ExamRegisterAsync(JingQiExamRegisterRequest request, Dictionary<string, string> headers)
+        public async Task<JingQiResult<JingQiExamRegisterResult>> ExamRegisterAsync(JingQiExamRegisterRequest request, Dictionary<string, string> headers, string idCardNo)
         {
-            Logger.WriteLineInfo($"VitalMixtureService JingQiApiHelper ExamRegisterAsync start, request:{request}");
-            return await GetJingQiResult<JingQiExamRegisterResult>(RegisterUrl, JsonConvert.SerializeObject(request), headers);
+            Logger.WriteLineInfo($"VitalMixtureService JingQiApiHelper ExamRegisterAsync start, idCardNo:{idCardNo}, request:{request}");
+            return await GetJingQiResult<JingQiExamRegisterResult>(RegisterUrl, JsonConvert.SerializeObject(request), headers, idCardNo);
         }
 
         /// <summary>
@@ -47,28 +47,28 @@ namespace VitalService.Factury
         /// <param name="request"></param>
         /// <param name="headers"></param>
         /// <returns></returns>
-        public async Task<JingQiResult<JingQiExamDeleteResult>> ExamDeleteAsync(JingQiExamDeleteRequest request, Dictionary<string, string> headers)
+        public async Task<JingQiResult<JingQiExamDeleteResult>> ExamDeleteAsync(JingQiExamDeleteRequest request, Dictionary<string, string> headers, string idCardNo)
         {
-            Logger.WriteLineInfo($"VitalMixtureService JingQiApiHelper ExamDeleteAsync start, request:{request}");
-            return await GetJingQiResult<JingQiExamDeleteResult>(DeleteRegisterUrl, JsonConvert.SerializeObject(request), headers);
+            Logger.WriteLineInfo($"VitalMixtureService JingQiApiHelper ExamDeleteAsync start, idCardNo:{idCardNo}, request:{request}");
+            return await GetJingQiResult<JingQiExamDeleteResult>(DeleteRegisterUrl, JsonConvert.SerializeObject(request), headers, idCardNo);
         }
 
-        private async Task<JingQiResult<TResult>> GetJingQiResult<TResult>(string url, string request, Dictionary<string, string> headers)
+        private async Task<JingQiResult<TResult>> GetJingQiResult<TResult>(string url, string request, Dictionary<string, string> headers, string idCardNo)
         {
             try
             {
                 var res = await GetResult(url, request, headers);
-                Logger.WriteLineInfo($"VitalMixtureService JingQiApiHelper GetJingQiResult success, res:{res}");
+                Logger.WriteLineInfo($"VitalMixtureService JingQiApiHelper GetJingQiResult success, idCardNo:{idCardNo}, res:{res}");
                 if (!string.IsNullOrWhiteSpace(res))
                 {
                     var jingQiResult = JsonConvert.DeserializeObject<JingQiResult<TResult>>(res);
                     if (jingQiResult.status == "0")
                     {
-                        Logger.WriteLineInfo($"VitalMixtureService JingQiApiHelper GetJingQiResult success, ErroMsg:{jingQiResult.ErroMsg}");
+                        Logger.WriteLineInfo($"VitalMixtureService JingQiApiHelper GetJingQiResult success, idCardNo:{idCardNo}, ErroMsg:{jingQiResult.ErroMsg}");
                     }
                     else
                     {
-                        Logger.WriteLineError($"VitalMixtureService JingQiApiHelper GetJingQiResult failed, status:{jingQiResult.status}, ErroMsg:{jingQiResult.ErroMsg}");
+                        Logger.WriteLineError($"VitalMixtureService JingQiApiHelper GetJingQiResult failed, idCardNo:{idCardNo}, status:{jingQiResult.status}, ErroMsg:{jingQiResult.ErroMsg}");
                     }
                     return jingQiResult;
                 }
@@ -80,7 +80,7 @@ namespace VitalService.Factury
             }
             catch (Exception ex)
             {
-                Logger.WriteLineWarn($"VitalMixtureService JingQiApiHelper GetJingQiResult error, ex:{ex}");
+                Logger.WriteLineWarn($"VitalMixtureService JingQiApiHelper GetJingQiResult error, idCardNo:{idCardNo}, ex:{ex}");
                 return new JingQiResult<TResult>
                 {
                     status = "error",

src/VitalMixtureService/FrontService/Service/FacturyUserService.cs

@@ -172,7 +172,7 @@ namespace VitalService.Service
                         usrcode = facturyUser.FacturyCode,
                         phydatetime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                     };
-                    var jingQiRes = await _jingQiApiHelper.ExamRegisterAsync(jingQiReq, facturyOrg.FacturyData);
+                    var jingQiRes = await _jingQiApiHelper.ExamRegisterAsync(jingQiReq, facturyOrg.FacturyData, request.Identity);
                     await _vitalFacturyPostHistoryDBService.CreateFacturyPostHistoryDBAsync(new CreateFacturyPostHistoryDBRequest
                     {
                         ApiType = "ExamRegisterAsync",
@@ -246,7 +246,7 @@ namespace VitalService.Service
                     {
                         phyid = request.PhyId,
                     };
-                    var jingQiRes = await _jingQiApiHelper.ExamDeleteAsync(jingQiReq, facturyOrg.FacturyData);
+                    var jingQiRes = await _jingQiApiHelper.ExamDeleteAsync(jingQiReq, facturyOrg.FacturyData, request.Identity);
                     await _vitalFacturyPostHistoryDBService.CreateFacturyPostHistoryDBAsync(new CreateFacturyPostHistoryDBRequest
                     {
                         ApiType = "ExamDeleteAsync",