预约

ThirdPlugIns/Shentun.Peis.PlugIns.Gem/Connected Services/ServiceReferenceYinHai/ConnectedService.json

@@ -0,0 +1,15 @@
+{
+  "providerId": "Microsoft.Tools.ServiceModel.Svcutil",
+  "version": "2.0.3",
+  "options": {
+    "inputs": [
+      "http://192.168.1.194:8080/jcdsbws/proxy/lis_server?wsdl"
+    ],
+    "namespaceMappings": [
+      "*, ServiceReference"
+    ],
+    "outputFile": "Reference.cs",
+    "targetFramework": "net6.0",
+    "typeReuseMode": "All"
+  }
+}

ThirdPlugIns/Shentun.Peis.PlugIns.Gem/Connected Services/ServiceReferenceYinHai/Reference.cs

@@ -0,0 +1,218 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，并在以下条件下丢失:
+//     代码重新生成。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace ServiceReferenceYinHai
+{
+    
+    
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.3")]
+    [System.ServiceModel.ServiceContractAttribute(Namespace="http://esb.webservice", ConfigurationName="ServiceReferenceYinHai.WebService")]
+    public interface WebService
+    {
+        
+        [System.ServiceModel.OperationContractAttribute(Action="", ReplyAction="*")]
+        [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
+        System.Threading.Tasks.Task<ServiceReferenceYinHai.callBussinessResponse> callBussinessAsync(ServiceReferenceYinHai.callBussiness request);
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.3")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://esb.webservice")]
+    public partial class soapResponse
+    {
+        
+        private string msgField;
+        
+        private string status_codeField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=0)]
+        public string msg
+        {
+            get
+            {
+                return this.msgField;
+            }
+            set
+            {
+                this.msgField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=1)]
+        public string status_code
+        {
+            get
+            {
+                return this.status_codeField;
+            }
+            set
+            {
+                this.status_codeField = value;
+            }
+        }
+    }
+    
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.3")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="callBussiness", WrapperNamespace="http://esb.webservice", IsWrapped=true)]
+    public partial class callBussiness
+    {
+        
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://esb.webservice", Order=0)]
+        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
+        public string message;
+        
+        public callBussiness()
+        {
+        }
+        
+        public callBussiness(string message)
+        {
+            this.message = message;
+        }
+    }
+    
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.3")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="callBussinessResponse", WrapperNamespace="http://esb.webservice", IsWrapped=true)]
+    public partial class callBussinessResponse
+    {
+        
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://esb.webservice", Order=0)]
+        [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
+        public ServiceReferenceYinHai.soapResponse data;
+        
+        public callBussinessResponse()
+        {
+        }
+        
+        public callBussinessResponse(ServiceReferenceYinHai.soapResponse data)
+        {
+            this.data = data;
+        }
+    }
+    
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.3")]
+    public interface WebServiceChannel : ServiceReferenceYinHai.WebService, System.ServiceModel.IClientChannel
+    {
+    }
+    
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.3")]
+    public partial class WebServiceClient : System.ServiceModel.ClientBase<ServiceReferenceYinHai.WebService>, ServiceReferenceYinHai.WebService
+    {
+        
+        /// <summary>
+        /// 实现此分部方法，配置服务终结点。
+        /// </summary>
+        /// <param name="serviceEndpoint">要配置的终结点</param>
+        /// <param name="clientCredentials">客户端凭据</param>
+        static partial void ConfigureEndpoint(System.ServiceModel.Description.ServiceEndpoint serviceEndpoint, System.ServiceModel.Description.ClientCredentials clientCredentials);
+        
+        public WebServiceClient() : 
+                base(WebServiceClient.GetDefaultBinding(), WebServiceClient.GetDefaultEndpointAddress())
+        {
+            this.Endpoint.Name = EndpointConfiguration.WebServicePort.ToString();
+            ConfigureEndpoint(this.Endpoint, this.ClientCredentials);
+        }
+        
+        public WebServiceClient(EndpointConfiguration endpointConfiguration) : 
+                base(WebServiceClient.GetBindingForEndpoint(endpointConfiguration), WebServiceClient.GetEndpointAddress(endpointConfiguration))
+        {
+            this.Endpoint.Name = endpointConfiguration.ToString();
+            ConfigureEndpoint(this.Endpoint, this.ClientCredentials);
+        }
+        
+        public WebServiceClient(EndpointConfiguration endpointConfiguration, string remoteAddress) : 
+                base(WebServiceClient.GetBindingForEndpoint(endpointConfiguration), new System.ServiceModel.EndpointAddress(remoteAddress))
+        {
+            this.Endpoint.Name = endpointConfiguration.ToString();
+            ConfigureEndpoint(this.Endpoint, this.ClientCredentials);
+        }
+        
+        public WebServiceClient(EndpointConfiguration endpointConfiguration, System.ServiceModel.EndpointAddress remoteAddress) : 
+                base(WebServiceClient.GetBindingForEndpoint(endpointConfiguration), remoteAddress)
+        {
+            this.Endpoint.Name = endpointConfiguration.ToString();
+            ConfigureEndpoint(this.Endpoint, this.ClientCredentials);
+        }
+        
+        public WebServiceClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : 
+                base(binding, remoteAddress)
+        {
+        }
+        
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        System.Threading.Tasks.Task<ServiceReferenceYinHai.callBussinessResponse> ServiceReferenceYinHai.WebService.callBussinessAsync(ServiceReferenceYinHai.callBussiness request)
+        {
+            return base.Channel.callBussinessAsync(request);
+        }
+        
+        public System.Threading.Tasks.Task<ServiceReferenceYinHai.callBussinessResponse> callBussinessAsync(string message)
+        {
+            ServiceReferenceYinHai.callBussiness inValue = new ServiceReferenceYinHai.callBussiness();
+            inValue.message = message;
+            return ((ServiceReferenceYinHai.WebService)(this)).callBussinessAsync(inValue);
+        }
+        
+        public virtual System.Threading.Tasks.Task OpenAsync()
+        {
+            return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginOpen(null, null), new System.Action<System.IAsyncResult>(((System.ServiceModel.ICommunicationObject)(this)).EndOpen));
+        }
+        
+        public virtual System.Threading.Tasks.Task CloseAsync()
+        {
+            return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginClose(null, null), new System.Action<System.IAsyncResult>(((System.ServiceModel.ICommunicationObject)(this)).EndClose));
+        }
+        
+        private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
+        {
+            if ((endpointConfiguration == EndpointConfiguration.WebServicePort))
+            {
+                System.ServiceModel.BasicHttpBinding result = new System.ServiceModel.BasicHttpBinding();
+                result.MaxBufferSize = int.MaxValue;
+                result.ReaderQuotas = System.Xml.XmlDictionaryReaderQuotas.Max;
+                result.MaxReceivedMessageSize = int.MaxValue;
+                result.AllowCookies = true;
+                return result;
+            }
+            throw new System.InvalidOperationException(string.Format("找不到名称为“{0}”的终结点。", endpointConfiguration));
+        }
+        
+        private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
+        {
+            if ((endpointConfiguration == EndpointConfiguration.WebServicePort))
+            {
+                return new System.ServiceModel.EndpointAddress("http://192.168.1.194:8080/jcdsbws/proxy/lis_server");
+            }
+            throw new System.InvalidOperationException(string.Format("找不到名称为“{0}”的终结点。", endpointConfiguration));
+        }
+        
+        private static System.ServiceModel.Channels.Binding GetDefaultBinding()
+        {
+            return WebServiceClient.GetBindingForEndpoint(EndpointConfiguration.WebServicePort);
+        }
+        
+        private static System.ServiceModel.EndpointAddress GetDefaultEndpointAddress()
+        {
+            return WebServiceClient.GetEndpointAddress(EndpointConfiguration.WebServicePort);
+        }
+        
+        public enum EndpointConfiguration
+        {
+            
+            WebServicePort,
+        }
+    }
+}

ThirdPlugIns/Shentun.Peis.PlugIns.Gem/LisRequests/YinHai/LisRequestPlugInsYinHai.cs

@@ -0,0 +1,44 @@
+using Dapper;
+using Npgsql;
+using NPOI.SS.Formula.Functions;
+using ServiceReferenceDianLisResult;
+using ServiceReferenceYinHai;
+using Shentun.Peis.ImportLisResults;
+using Shentun.Peis.PlugIns.Extensions.ImportLisResults.Dian;
+using Shentun.Peis.PlugIns.ImportLisResults;
+using Shentun.Peis.PlugIns.LisRequests;
+using Shentun.Peis.PrintReports;
+using Shentun.Peis.RegisterCheckPictures;
+using System;
+using System.Collections.Generic;
+using System.Data.Common;
+using System.Linq;
+using System.ServiceModel;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Shentun.Peis.PlugIns.Extensions.LisRequests.Hzcy
+{
+    public class LisRequestPlugInsYinHai 
+    {
+        public LisRequestPlugInsYinHai() 
+        {
+
+        }
+     
+        public async Task Testssss(Guid patientRegisterId)
+        {
+            string lisResultAddress = "";
+            using (var client = CreateClient(lisResultAddress))
+            {
+                await client.callBussinessAsync("");
+            }
+        }
+
+        private WebServiceClient CreateClient(string url)
+        {
+            return new WebServiceClient(new BasicHttpBinding(),
+                new EndpointAddress(url));
+        }
+    }
+}

src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointPlugInsBase.cs

@@ -3,6 +3,7 @@ using Npgsql;
 using Shentun.Peis.AppointPatientRegisters;
 using Shentun.Peis.AppointRegisterAsbitems;
 using Shentun.Peis.CustomerReports;
+using Shentun.Peis.Patients;
 using Shentun.Peis.TransToWebPeiss;
 using System;
 using System.Collections.Generic;
@@ -97,6 +98,16 @@ namespace Shentun.Peis.PlugIns.WebAppoints
 
         }
 
+        /// <summary>
+        /// 根据身份证查询问卷信息
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public virtual async Task<List<QuestionRegisterItemResultDto>> GetQuestionRegisterListByIdNoAsync(IdNoInputDto input)
+        {
+            throw new NotImplementedException();
+        }
 
         /// <summary>
         /// 体检系统申请退款

src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointWebPeisPlugIns.cs

@@ -9,6 +9,7 @@ using Shentun.Peis.AppointPatientRegisters;
 using Shentun.Peis.AppointRegisterAsbitems;
 using Shentun.Peis.CustomerReports;
 using Shentun.Peis.Enums;
+using Shentun.Peis.Patients;
 using Shentun.Peis.PlugIns.ColumnReferences;
 using Shentun.Peis.TransToWebPeiss;
 using System;
@@ -34,6 +35,7 @@ namespace Shentun.Peis.PlugIns.WebAppoints
         private string _webPeisGetAppointStatisticsReportUrl;
         private string _webPeisGerAppointPatientRegisterWithAsbitemListUrl;
         private string _webPeisCreateWeChatOrderRefundUrl;
+        private string _webPeisGetQuestionRegisterListByIdNoUrl;
         private Guid _medicalCenterId;
         public WebAppointWebPeisPlugIns(Guid thirdInterfaceId) : base(thirdInterfaceId)
         {
@@ -55,6 +57,7 @@ namespace Shentun.Peis.PlugIns.WebAppoints
             _webPeisGetAppointStatisticsReportUrl = InterfaceConfig.GetSection("Interface").GetSection("GetAppointStatisticsReportUrl").Value;
             _webPeisGerAppointPatientRegisterWithAsbitemListUrl = InterfaceConfig.GetSection("Interface").GetSection("GerAppointPatientRegisterWithAsbitemListUrl").Value;
             _webPeisCreateWeChatOrderRefundUrl = InterfaceConfig.GetSection("Interface").GetSection("CreateWeChatOrderRefundUrl").Value;
+            _webPeisGetQuestionRegisterListByIdNoUrl= InterfaceConfig.GetValue("Interface:GetQuestionRegisterListByIdNo", "api/app/QuestionRegister/GetQuestionRegisterListByIdNo");
         }
         /// <summary>
         /// 获取预约人员列表
@@ -226,6 +229,22 @@ namespace Shentun.Peis.PlugIns.WebAppoints
             return appointPatientRegisterWithAsbitemListDto;
         }
 
+
+        /// <summary>
+        /// 根据身份证查询问卷信息
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public override async Task<List<QuestionRegisterItemResultDto>> GetQuestionRegisterListByIdNoAsync(IdNoInputDto input)
+        {
+            var appointStatisticsReportListDto = await CallWePeisAppServiceAsync<IdNoInputDto,
+              List<QuestionRegisterItemResultDto>>
+                (_webPeisGetQuestionRegisterListByIdNoUrl, input);
+            return appointStatisticsReportListDto;
+        }
+
+
         /// <summary>
         /// 体检系统申请退款
         /// </summary>

src/Shentun.Peis.Application.Contracts/AppointPatientRegisters/QuestionRegisterItemResultDto.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shentun.Peis.AppointPatientRegisters
+{
+    public class QuestionRegisterItemResultDto
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public Guid QuestionRegisterItemId { get; set; }
+        /// <summary>
+        /// 问卷ID
+        /// </summary>
+        public Guid QuestionId { get; set; }
+        /// <summary>
+        /// 题目
+        /// </summary>
+
+        public string QuestionName { get; set; } = null!;
+
+
+        /// <summary>
+        /// 显示顺序
+        /// </summary>
+        public int DisplayOrder { get; set; }
+
+        public List<QuestionRegisterItemResultAnswer> Answers { get; set; } = new List<QuestionRegisterItemResultAnswer>();
+    }
+
+    public class QuestionRegisterItemResultAnswer
+    {
+        public string Answer { get; set; }
+        public int DisplayOrder { get; set; }
+    }
+}

src/Shentun.Peis.Application.Contracts/CardBills/GetCardBillListDto.cs

@@ -53,5 +53,11 @@ namespace Shentun.Peis.CardBills
         /// 支付方式 集合
         /// </summary>
         public List<string> PayModeIds { get; set; } = new List<string>();
+
+
+        /// <summary>
+        /// 操作用户id 集合
+        /// </summary>
+        public List<Guid> OperateUserIds { get; set; } = new List<Guid>();
     }
 }

src/Shentun.Peis.Application.Contracts/CardBills/GetCardBillStatisticsReportInputDto.cs

@@ -26,7 +26,7 @@ namespace Shentun.Peis.CardBills
         /// 手机
         /// </summary>
         public string Phone { get; set; }
- 
+
 
         /// <summary>
         /// 记账标志 0、充值  1、扣费   2、退费  
@@ -48,5 +48,11 @@ namespace Shentun.Peis.CardBills
         /// 支付方式 集合
         /// </summary>
         public List<string> PayModeIds { get; set; } = new List<string>();
+
+
+        /// <summary>
+        /// 操作用户id 集合
+        /// </summary>
+        public List<Guid> OperateUserIds { get; set; } = new List<Guid>();
     }
 }

src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/GetRegisterCheckAsbitemWithMedicalCenterDto.cs

@@ -8,6 +8,12 @@ namespace Shentun.Peis.RegisterCheckAsbitems
     {
         public Guid RegisterCheckAsbitemId { get; set; }
 
+
+        /// <summary>
+        /// 体检中心名称
+        /// </summary>
+        public Guid MedicalCenterId { get; set; }
+
         /// <summary>
         /// 体检中心名称
         /// </summary>

src/Shentun.Peis.Application/AppointPatientRegisters/AppointPatientRegisterAppService.cs

@@ -10,8 +10,10 @@ using Shentun.Peis.CustomerReports;
 using Shentun.Peis.Enums;
 using Shentun.Peis.Models;
 using Shentun.Peis.PatientRegisters;
+using Shentun.Peis.Patients;
 using Shentun.Peis.PlugIns;
 using Shentun.Peis.PlugIns.WebAppoints;
+using Shentun.Peis.Poisons;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -366,6 +368,36 @@ namespace Shentun.Peis.AppointPatientRegisters
         }
 
 
+
+        /// <summary>
+        /// 根据身份证查询问卷信息
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        /// <exception cref="UserFriendlyException"></exception>
+        [HttpPost("api/app/QuestionRegister/GetQuestionRegisterListByPatientRegisterNo")]
+        public async Task<List<QuestionRegisterItemResultDto>> GetQuestionRegisterListByIdNoAsync(IdNoInputDto input)
+        {
+            var thirdInterface = await _thirdInterfaceRepository.FirstOrDefaultAsync(f => f.ThirdInterfaceType == ThirdInterfaceTypeFlag.WebAppoint);
+            if (thirdInterface.IsActive != 'Y')
+            {
+                throw new UserFriendlyException("该接口已禁用");
+            }
+
+            object[] objects = [input];
+            var parmValue = thirdInterface.ParmValue;
+            var configurationBuilder = new ConfigurationBuilder()
+               .AddJsonStream(new MemoryStream(System.Text.Encoding.UTF8.GetBytes(parmValue)));
+            var config = configurationBuilder.Build();
+            var assemblyName = config.GetSection("Interface").GetSection("AssemblyName").Value;
+            var className = config.GetSection("Interface").GetSection("ClassName").Value;
+
+            var pluginsOut = await Utilities.ReflectionHelper.InvokeAsync<List<QuestionRegisterItemResultDto>>(assemblyName,
+                className, [thirdInterface.Id], "GetQuestionRegisterListByIdNoAsync", objects);
+            return pluginsOut;
+        }
+
+
         #region 提供给小程序的接口
 
         /// <summary>

src/Shentun.Peis.Application/CardBills/CardBillAppService.cs

@@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
 using Microsoft.EntityFrameworkCore;
 using Shentun.Peis.Enums;
 using Shentun.Peis.Models;
+using SqlSugar;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -114,6 +115,11 @@ namespace Shentun.Peis.CardBills
                     queryable = queryable.Where(m => input.PayModeIds.Contains(m.PayModeId));
                 }
 
+                if (input.OperateUserIds.Any())
+                {
+                    queryable = queryable.Where(m => input.OperateUserIds.Contains(m.CreatorId.Value));
+                }
+
                 var userlist = await _userRepository.GetListAsync();
 
                 var entlist = queryable.Select(s => new CardBillDto
@@ -415,6 +421,11 @@ namespace Shentun.Peis.CardBills
                 query = query.Where(m => input.PayModeIds.Contains(m.cardBill.PayModeId));
             }
 
+            if (input.OperateUserIds.Any())
+            {
+                query = query.Where(m => input.OperateUserIds.Contains(m.cardBill.CreatorId.Value));
+            }
+
 
             var queryList = query.ToList().GroupBy(g => g.cardRegister);
 

src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs

@@ -875,7 +875,9 @@ namespace Shentun.Peis.PatientRegisters
                 CustomerOrgGroupName = s.patientRegister.CustomerOrgGroupId == null ? "" : _cacheService.GetCustomerOrgGroupAsync(s.patientRegister.CustomerOrgGroupId.Value).GetAwaiter().GetResult().DisplayName,
                 NationName = _cacheService.GetNationNameAsync(s.patient.NationId).GetAwaiter().GetResult(),
                 PersonnelTypeName = _cacheService.GetPersonnelTypeNameAsync(s.patientRegister.PersonnelTypeId).GetAwaiter().GetResult(),
-                MaritalStatusName = _cacheService.GetMaritalStatusNameAsync(s.patientRegister.MaritalStatusId).GetAwaiter().GetResult()
+                MaritalStatusName = _cacheService.GetMaritalStatusNameAsync(s.patientRegister.MaritalStatusId).GetAwaiter().GetResult(),
+                MedicalTypeName = _cacheService.GetMedicalTypeNameAsync(s.patientRegister.MedicalTypeId).GetAwaiter().GetResult(),
+                SexName = _cacheService.GetSexNameAsync(s.patientRegister.SexId).GetAwaiter().GetResult()
                 // SummaryHistoricalReview = s.patientRegister.SummaryHistoricalReview
             }).ToList();
 
@@ -1130,7 +1132,9 @@ namespace Shentun.Peis.PatientRegisters
                     CustomerOrgGroupName = group.Key.CustomerOrgGroupId == null ? "" : _cacheService.GetCustomerOrgGroupAsync(group.Key.CustomerOrgGroupId.Value).GetAwaiter().GetResult().DisplayName,
                     NationName = _cacheService.GetNationNameAsync(group.FirstOrDefault().patient.NationId).GetAwaiter().GetResult(),
                     PersonnelTypeName = _cacheService.GetPersonnelTypeNameAsync(group.Key.PersonnelTypeId).GetAwaiter().GetResult(),
-                    MaritalStatusName = _cacheService.GetMaritalStatusNameAsync(group.Key.MaritalStatusId).GetAwaiter().GetResult()
+                    MaritalStatusName = _cacheService.GetMaritalStatusNameAsync(group.Key.MaritalStatusId).GetAwaiter().GetResult(),
+                    MedicalTypeName = _cacheService.GetMedicalTypeNameAsync(group.Key.MedicalTypeId).GetAwaiter().GetResult(),
+                    SexName = _cacheService.GetSexNameAsync(group.Key.SexId).GetAwaiter().GetResult()
                 };
 
                 entDto.StandardAmount = 0;

src/Shentun.Peis.Application/RegisterCheckAsbitems/RegisterCheckAsbitemAppService.cs

@@ -897,6 +897,7 @@ namespace Shentun.Peis.RegisterAsbitems
                 AsbitemName = s.asbitem.DisplayName,
                 IdNo = s.patient.IdNo,
                 MedicalCenterName = s.medicalCenterHaveEmpty != null ? s.medicalCenterHaveEmpty.DisplayName : "",
+                MedicalCenterId = s.registerCheckAsbitem.MedicalCenterId,
                 PatientName = s.patientRegister.PatientName,
                 PatientRegisterCompleteFlag = s.patientRegister.CompleteFlag,
                 RegisterCheckCompleteFlag = s.registerCheck.CompleteFlag