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

src/Shentun.Peis.Application.Contracts/PatientRegisters/UpdatePatientRegisterSummarySuggestionDto.cs

@@ -26,8 +26,7 @@ namespace Shentun.Peis.PatientRegisters
         /// <summary>
         /// 体检结论ID
         /// </summary>
-        [Required(ErrorMessage ="体检结论不能为空")]
-        public Guid MedicalConclusionId { get; set; }
+        public Guid? MedicalConclusionId { get; set; }
 
         public List<UpdateSumSummaryDto> SumSummarys { get; set; }
         public List<UpdateSumSuggestionDto> SumSuggestions { get; set; }

src/Shentun.Peis.Application/ReportFormatTemplates/ReportFormatTemplateAppService.cs

@@ -215,6 +215,7 @@ namespace Shentun.Peis.ReportFormatTemplates
         /// <param name="id"></param>
         /// <param name="input"></param>
         /// <returns></returns>
+        [HttpPost("api/app/ReportFormatTemplate/Update")]
         public override async Task<ReportFormatTemplateDto> UpdateAsync(string id, UpdateReportFormatTemplateDto input)
         {
             var entity = await Repository.GetAsync(id);

src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs

@@ -124,17 +124,17 @@ namespace Shentun.Peis.LisRequests
                 }
             }
             //未设置的申请单设置到相同分组的已有申请单
-            var noRequestCheckAsbitems = registerCheckAsbitems.Where(o=>o.LisRequestId == null || o.LisRequestId == Guid.Empty).ToList();
-            foreach(var registerCheckAsbitem in noRequestCheckAsbitems)
+            var noRequestCheckAsbitems = registerCheckAsbitems.Where(o => o.LisRequestId == null || o.LisRequestId == Guid.Empty).ToList();
+            foreach (var registerCheckAsbitem in noRequestCheckAsbitems)
             {
                 var registerCheckAsbitemLis = registerCheckAsbitemLisList.Where(o => o.RegisterCheckAsbitemId == registerCheckAsbitem.Id).SingleOrDefault();
                 if (registerCheckAsbitemLis == null)
                 {
                     continue;
                 }
-                var haveRegisterCheckAsbitemLis =  registerCheckAsbitemLisList.Where(o => o.SampleGroupId == registerCheckAsbitemLis.SampleGroupId
+                var haveRegisterCheckAsbitemLis = registerCheckAsbitemLisList.Where(o => o.SampleGroupId == registerCheckAsbitemLis.SampleGroupId
                 && o.LisRequestId != null && o.LisRequestId != Guid.Empty).SingleOrDefault();
-                if( haveRegisterCheckAsbitemLis != null)
+                if (haveRegisterCheckAsbitemLis != null)
                 {
                     registerCheckAsbitem.LisRequestId = haveRegisterCheckAsbitemLis.LisRequestId;
                     updateRegisterCheckAsbitems.Add(registerCheckAsbitem);
@@ -145,7 +145,7 @@ namespace Shentun.Peis.LisRequests
             var noRequestLisList = registerCheckAsbitemLisList.Where(o => noRequestCheckAsbitems.Select(o => o.Id).Contains(o.RegisterCheckAsbitemId)).ToList();
             var sampleGroupids = noRequestLisList.Select(o => o.SampleGroupId).Distinct();
             createLisRequests = new List<LisRequest>();
-            foreach ( var sampleGroupid in sampleGroupids)
+            foreach (var sampleGroupid in sampleGroupids)
             {
                 var sampleGroup = sampleGroups.Where(o => o.Id == sampleGroupid).Single();
                 //var guid = GuidGenerator.Create();
@@ -160,7 +160,7 @@ namespace Shentun.Peis.LisRequests
                 createLisRequests.Add(lisRequest);
                 foreach (var requestLis in noRequestLisList)
                 {
-                    if(requestLis.SampleGroupId ==  sampleGroupid)
+                    if (requestLis.SampleGroupId == sampleGroupid)
                     {
                         requestLis.LisRequestId = lisRequest.Id;
                         var registerCheckAsbitem = noRequestCheckAsbitems.Where(o => o.Id == requestLis.RegisterCheckAsbitemId).Single();
@@ -170,7 +170,7 @@ namespace Shentun.Peis.LisRequests
                 }
             }
 
-           
+
         }
 
 
@@ -314,7 +314,7 @@ namespace Shentun.Peis.LisRequests
         public async Task SendThirdLisRequest(Guid id)
         {
             var thirdInterfaces = (await _thirdInterfaceRepository.GetListAsync(o => o.ThirdInterfaceType == ThirdInterfaceTypeFlag.ChargeRequest))
-                                   .OrderBy(o=>o.DisplayOrder).ToList();
+                                   .OrderBy(o => o.DisplayOrder).ToList();
             foreach (var thirdInterface in thirdInterfaces)
             {
                 var lisRequestPluginsInput = new LisRequestPluginsInput()
@@ -328,7 +328,7 @@ namespace Shentun.Peis.LisRequests
                 var config = configurationBuilder.Build();
                 var assemblyName = config.GetSection("Interface").GetSection("AssemblyName").Value;
                 var className = config.GetSection("Interface").GetSection("ClassName").Value;
-                object[] objects = [lisRequestPluginsInput];
+                object[] objects = new object[] { lisRequestPluginsInput };
                 var LisRequestPluginsOut = await InvokeAsync(assemblyName, className, parmValue, "SendRequest", objects);
             }
         }
@@ -461,7 +461,7 @@ namespace Shentun.Peis.LisRequests
         }
 
         private class RegisterCheckAsbitemLis
-        { 
+        {
             public Guid RegisterCheckAsbitemId { get; set; }
             public Guid SampleGroupId { get; set; }
             public Guid? LisRequestId { get; set; }

src/Shentun.Peis.Domain/ReportTemplates/CustomerOrgReportManager.cs

@@ -821,18 +821,18 @@ namespace Shentun.Peis.ReportTemplates
             Header header = template.Headers.Odd;
             // Insert Paragraph in header
             Paragraph paragraph = header.InsertParagraph();
-            Xceed.Document.NET.Image logo = template.AddImage(DirectoryName + @"\CustomerOrgTemplate\header.jpg");
+            Xceed.Document.NET.Image logo = template.AddImage(DirectoryName + @"\CustomerOrgTemplate\logo.jpg");
             var pic = logo.CreatePicture();
-            pic.Width = 41.59f;
-            pic.Height = 30.3f;
+            pic.Width = 40f;
+            pic.Height = 40f;
             paragraph.AppendPicture(pic);
             paragraph.Append("\t\t\t\t健康体检中心");
 
             template.AddFooters();
             Footer footer = template.Footers.Odd;
             // Insert Paragraph in header
-            Paragraph paragraph1 = footer.InsertParagraph();
-            paragraph1.Append("File Format Develoer Guide");
+            //Paragraph paragraph1 = footer.InsertParagraph();
+            //paragraph1.Append("File Format Develoer Guide");
             #region 封面
 
             template.ReplaceText(new StringReplaceTextOptions
@@ -1138,7 +1138,10 @@ namespace Shentun.Peis.ReportTemplates
             Formatting p1TitleFormatting = new Formatting();
             p1TitleFormatting.FontFamily = new Xceed.Document.NET.Font("宋体");
             p1TitleFormatting.FontColor = Color.FromArgb(0, 128, 0);
-            row0.Cells[0].Paragraphs[0].AppendPicture(logo.CreatePicture());
+            var pic = logo.CreatePicture();
+            pic.Width = 65f;
+            pic.Height = 65f;
+            row0.Cells[0].Paragraphs[0].AppendPicture(pic);
             row0.Cells[0].VerticalAlignment = VerticalAlignment.Center;
             row0.Cells[1].Width = document.PageWidth - document.MarginLeft - document.MarginRight - 30f;
             row0.Cells[1].Paragraphs[0].Append("团体体检健康检查统计报告", p1TitleFormatting).FontSize(22).Alignment = Alignment.center;