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

ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ChargeRequestPlugInsGem.cs

@@ -130,7 +130,72 @@ namespace Shentun.Peis.PlugIns.Gem
             return new ChargeRequestPlugInsOut();
         }
 
+        public override async Task<ChargeRequestPlugInsOut> CancelRequest(ChargeRequestPlugInsInput input)
+        {
+            var chargeRequestForPlugIns = await GeChargeRequestForPlugInsAsync(input.ChargeRequestId);
+            if (chargeRequestForPlugIns == null)
+            {
+                throw new Exception("没有申请单信息");
+            }
+            var hisInput = new HisCancelQrCodeInput()
+            {
+                Data = new HisCancelQrCodeDataInput()
+                {
+                    MsgHeader = new HisMsgHeaderInput()
+                    {
+                        Sender = "PEIS",
+                        MsgType = "SVR_ODS_6105",
+                        MsgVersion = "3.1",
+                    },
+                    Item = new HisCancelQrCodeDataItemInput()
+                    {
+                        Yjxh = chargeRequestForPlugIns.HisChargeNo,
+                        ExamRequestNo = chargeRequestForPlugIns.ChargeRequestNo
+                    }
+                }
+            };
+
+            var result = await CancelQrCode(hisInput);
+            if (result.MsgHeader.Status != "true")
+            {
+                throw new Exception("作废申请单失败" + result.MsgHeader.Detail);
+            }
+            return new ChargeRequestPlugInsOut();
+        }
 
+        public override async Task<ChargeRequestPlugInsOut> RefundRequest(ChargeRequestPlugInsInput input)
+        {
+            var chargeRequestForPlugIns = await GeChargeRequestForPlugInsAsync(input.ChargeRequestId);
+            if (chargeRequestForPlugIns == null)
+            {
+                throw new Exception("没有申请单信息");
+            }
+
+            var hisInput = new HisAgreeRefundInput()
+            {
+                Data = new HisAgreeRefundDataInput()
+                {
+                    MsgHeader = new HisMsgHeaderInput()
+                    {
+                        Sender = "PEIS",
+                        MsgType = "SVR_ODS_6105",
+                        MsgVersion = "3.1",
+                    },
+                    Item = new HisAgreeRefundDataItemInput()
+                    {
+                        Yjxh = chargeRequestForPlugIns.HisChargeNo,
+                        ExamRequestNo = chargeRequestForPlugIns.ChargeRequestNo
+                    }
+                }
+            };
+
+            var result = await AgreeRefund(hisInput);
+            if (result.MsgHeader.Status != "true")
+            {
+                throw new Exception("允许退费申请失败" + result.MsgHeader.Detail);
+            }
+            return new ChargeRequestPlugInsOut();
+        }
         public async Task<HisPatientQueryOut> PatientQuery(HisPatientQueryInput input)
         {
             using (var client = CreateClient())
@@ -163,6 +228,53 @@ namespace Shentun.Peis.PlugIns.Gem
             }
         }
 
+        public async Task<HisOutBase> CancelQrCode(HisCancelQrCodeInput input)
+        {
+            using (var client = CreateClient())
+            {
+                input.SeviceBaseArg.Service = "cancelQrCode";
+                var data = XmlHelper.SerializeToXml(input.Data);
+
+                var resultStr = (await client.invokeAsync(input.SeviceBaseArg.Service,
+                    input.SeviceBaseArg.Urid,
+                    input.SeviceBaseArg.Pwd,
+                    data)).@return;
+                var result = XmlHelper.DeserializeXml<HisOutBase>(resultStr);
+                return result;
+            }
+        }
+
+        public async Task<HisOutBase> PayStatus(HisPayStatusInput input)
+        {
+            using (var client = CreateClient())
+            {
+                input.SeviceBaseArg.Service = "payStatus";
+                var data = XmlHelper.SerializeToXml(input.Data);
+
+                var resultStr = (await client.invokeAsync(input.SeviceBaseArg.Service,
+                    input.SeviceBaseArg.Urid,
+                    input.SeviceBaseArg.Pwd,
+                    data)).@return;
+                var result = XmlHelper.DeserializeXml<HisOutBase>(resultStr);
+                return result;
+            }
+        }
+
+        public async Task<HisOutBase> AgreeRefund(HisAgreeRefundInput input)
+        {
+            using (var client = CreateClient())
+            {
+                input.SeviceBaseArg.Service = "agreeRefund";
+                var data = XmlHelper.SerializeToXml(input.Data);
+
+                var resultStr = (await client.invokeAsync(input.SeviceBaseArg.Service,
+                    input.SeviceBaseArg.Urid,
+                    input.SeviceBaseArg.Pwd,
+                    data)).@return;
+                var result = XmlHelper.DeserializeXml<HisOutBase>(resultStr);
+                return result;
+            }
+        }
         private bstjPortTypeClient CreateClient()
         {
             return new bstjPortTypeClient(EndpointConfiguration.bstjHttpSoap11Endpoint,

src/Shentun.ColumnReferencePlugIns/ChargeRequestPlugInsBase.cs

@@ -26,7 +26,7 @@ namespace Shentun.Peis.PlugIns
             var result = new ChargeRequestPlugInsOut();
             return result;
         }
-        public virtual async Task<ChargeRequestPlugInsOut> Refund(ChargeRequestPlugInsInput input)
+        public virtual async Task<ChargeRequestPlugInsOut> RefundRequest(ChargeRequestPlugInsInput input)
         {
             var result = new ChargeRequestPlugInsOut();
             return result;

src/Shentun.Peis.Application.Contracts/ChargeRequests/ChargeRequestAsbitemDto.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shentun.Peis.ChargeRequests
+{
+    public class ChargeRequestAsbitemDto
+    {
+        public Guid AsbitemId { get; set; }
+        public string AsbitemName { get; set; }
+        public decimal ChargePrice { get; set; }
+        public int Amount { get; set; }
+    }
+}

src/Shentun.Peis.Application.Contracts/ChargeRequests/ChargeRequestDto.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
 using System.Text;
 
 namespace Shentun.Peis.ChargeRequests
@@ -8,5 +10,13 @@ namespace Shentun.Peis.ChargeRequests
     {
         public Guid Id { get; set; }
         public string ChargeRequestNo { get; set; }
+
+        public string HisChargeNo { get; set; }
+
+        public char ChargeRequestFlag { get; set; }
+
+        public decimal Charges {  get; set; }
+
+        public DateTime CreationTime { get; set; }
     }
 }

src/Shentun.Peis.Application.Contracts/ChargeRequests/ChargeRequestIdInputDto.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shentun.Peis.ChargeRequests
+{
+    public class ChargeRequestIdInputDto
+    {
+        public Guid ChargeRequestId { get; set; }
+    }
+}

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

@@ -17,6 +17,7 @@ namespace Shentun.Peis.PatientRegisters
         /// 档案ID
         /// </summary>
         public Guid PatientId { get; set; }
+        public string HisPatientId { get; set; }
 
         /// <summary>
         /// 体检次数

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

@@ -8,6 +8,7 @@ namespace Shentun.Peis.RegisterAsbitems
 {
     public class RegisterCheckAsbitemOrAsbitemDto : AuditedEntityDtoName
     {
+        public Guid RegisterCheckAsbitemId { get; set; }
         /// <summary>
         /// 组合项目
         /// </summary>

src/Shentun.Peis.Application/ChargeRequests/ChargeRequestAppService.cs

@@ -4,6 +4,7 @@ using Org.BouncyCastle.Asn1.Ocsp;
 using Shentun.Peis.ChargeRequestAsbitems;
 using Shentun.Peis.LisRequests;
 using Shentun.Peis.Models;
+using Shentun.Peis.PatientRegisters;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -25,6 +26,7 @@ namespace Shentun.Peis.ChargeRequests
         private readonly IRepository<PatientRegister, Guid> _patientRegisterRepository;
         private readonly IRepository<RegisterCheck, Guid> _registerCheckRepository;
         private readonly IRepository<RegisterCheckAsbitem, Guid> _registerCheckAsbitemRepository;
+        private readonly IRepository<Asbitem, Guid> _asbitemRepository;
         private readonly ChargeRequestManager _chargeRequestManager;
         private readonly ChargeRequestAsbitemManager _chargeRequestAsbitemManager;
         private readonly IUnitOfWorkManager _unitOfWorkManager;
@@ -34,6 +36,7 @@ namespace Shentun.Peis.ChargeRequests
             IRepository<PatientRegister, Guid> patientRegisterRepository,
             IRepository<RegisterCheck, Guid> registerCheckRepository,
             IRepository<RegisterCheckAsbitem, Guid> registerCheckAsbitemRepository,
+            IRepository<Asbitem, Guid> asbitemRepository,
             ChargeRequestManager chargeRequestManager,
             ChargeRequestAsbitemManager chargeRequestAsbitemManager,
             IUnitOfWorkManager unitOfWorkManager
@@ -47,9 +50,10 @@ namespace Shentun.Peis.ChargeRequests
             _chargeRequestManager = chargeRequestManager;
             _chargeRequestAsbitemManager = chargeRequestAsbitemManager;
             _unitOfWorkManager = unitOfWorkManager;
+            _asbitemRepository = asbitemRepository;
         }
         /// <summary>
-        /// 
+        /// 创建申请单
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -61,7 +65,7 @@ namespace Shentun.Peis.ChargeRequests
                 throw new UserFriendlyException("input参数不能为空");
             }
             
-            var patientRegister = _patientRegisterRepository.GetAsync(input.PatientRegisterId);
+            //var patientRegister = await _patientRegisterRepository.GetAsync(input.PatientRegisterId);
             var list = (from registerCheck in await _registerCheckRepository.GetQueryableAsync()
                         join registerCheckAsbitem in await _registerCheckAsbitemRepository.GetQueryableAsync()
                         on registerCheck.Id equals registerCheckAsbitem.RegisterCheckId
@@ -81,10 +85,10 @@ namespace Shentun.Peis.ChargeRequests
             foreach (var item in list)
             {
                 item.registerCheckAsbitem.ChargeRequestId = chargeRequest.Id;
-                await _registerCheckAsbitemRepository.UpdateAsync(item.registerCheckAsbitem,true);
+                await _registerCheckAsbitemRepository.UpdateAsync(item.registerCheckAsbitem);
             }
             //插入申请单信息
-            chargeRequest = await _chargeRequestRepository.InsertAsync(chargeRequest,true);
+            chargeRequest = await _chargeRequestRepository.InsertAsync(chargeRequest);
             foreach (var item in list)
             {
                 var chargeRequestAsbitemSource = new ChargeRequestAsbitem()
@@ -97,18 +101,131 @@ namespace Shentun.Peis.ChargeRequests
                     IsCharge = 'N'
                 };
                 var chargeRequestAsbitem = await _chargeRequestAsbitemManager.CreateAsync(chargeRequestAsbitemSource);
-                await _chargeRequestAsbitemRepository.InsertAsync(chargeRequestAsbitem,true);
+                await _chargeRequestAsbitemRepository.InsertAsync(chargeRequestAsbitem);
             }
-            //await _unitOfWorkManager.Current.SaveChangesAsync();
+            await _unitOfWorkManager.Current.SaveChangesAsync();
             await _unitOfWorkManager.Current.CompleteAsync();
             //await UnitOfWorkManager.Current.SaveChangesAsync();
             //await UnitOfWorkManager.Current.CompleteAsync();
-            await _chargeRequestManager.SendThirChargeRequestAsync(chargeRequest.Id);
+            await _chargeRequestManager.SendThirChargeRequestAsync(chargeRequest.Id,"SendRequest");
 
             ChargeRequestDto result = new ChargeRequestDto();
             result.Id = chargeRequest.Id;
             result.ChargeRequestNo = chargeRequest.ChargeRequestNo;
             return result;
         }
+        /// <summary>
+        /// 作废申请单
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        /// <exception cref="UserFriendlyException"></exception>
+        [HttpPost("api/app/ChargeRequest/CancelChargeRequest")]
+        public async Task<ChargeRequestDto> CancelChargeRequestAsync(ChargeRequestIdInputDto input)
+        {
+            if (input == null)
+            {
+                throw new UserFriendlyException("input参数不能为空");
+            }
+
+            await _chargeRequestManager.SendThirChargeRequestAsync(input.ChargeRequestId,"CancelRequest");
+
+            ChargeRequestDto result = new ChargeRequestDto();
+        
+            return result;
+        }
+        /// <summary>
+        /// 退费申请单
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        /// <exception cref="UserFriendlyException"></exception>
+        [HttpPost("api/app/ChargeRequest/RefundChargeRequest")]
+        public async Task<ChargeRequestDto> ReundChargeRequestAsync(ChargeRequestIdInputDto input)
+        {
+            if (input == null)
+            {
+                throw new UserFriendlyException("input参数不能为空");
+            }
+
+            await _chargeRequestManager.SendThirChargeRequestAsync(input.ChargeRequestId, "RefundRequest");
+
+            ChargeRequestDto result = new ChargeRequestDto();
+
+            return result;
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        /// <exception cref="UserFriendlyException"></exception>
+        [HttpPost("api/app/ChargeRequest/GetChargeRequestsByPatientRegisterId")]
+        public async Task<List<ChargeRequestDto>> GetChargeRequestsByPatientRegisterIdAsync(PatientRegisterIdInputDto input)
+        {
+            if (input == null)
+            {
+                throw new UserFriendlyException("input参数不能为空");
+            }
+
+            //var patientRegister = _patientRegisterRepository.GetAsync(input.PatientRegisterId);
+            var list = (from chargeRequest in await _chargeRequestRepository.GetQueryableAsync()
+             join patientRegister in await _patientRegisterRepository.GetQueryableAsync()
+             on chargeRequest.PatientRegisterId equals patientRegister.Id
+             join chargeRequestAsbitem in await _chargeRequestAsbitemRepository.GetQueryableAsync()
+             on chargeRequest.Id equals chargeRequestAsbitem.ChargeRequestId
+             where patientRegister.Id == input.PatientRegisterId
+             select new
+             {
+                 chargeRequest,
+                 chargeRequestAsbitem
+             }).ToList();
+            var result = list.GroupBy(o => o.chargeRequest).Select(o => new ChargeRequestDto()
+            {
+                Id = o.First().chargeRequest.Id,
+                ChargeRequestNo = o.First().chargeRequest.ChargeRequestNo,
+                ChargeRequestFlag = o.First().chargeRequest.ChargeRequestFlag,
+                HisChargeNo = o.First().chargeRequest.HisChargeNo,
+                Charges = o.Sum(o=>o.chargeRequestAsbitem.Amount * o.chargeRequestAsbitem.ChargePrice),
+                CreationTime = o.First().chargeRequest.CreationTime,
+               
+            }).OrderByDescending(o=>o.CreationTime).ToList();
+            return result;
+        }
+
+        [HttpPost("api/app/ChargeRequest/GetChargeRequestAsbitemsByChargeQuestId")]
+        public async Task<List<ChargeRequestAsbitemDto>> GetChargeRequestAsbitemsByChargeQuestIdAsync(ChargeRequestIdInputDto input)
+        {
+            if (input == null)
+            {
+                throw new UserFriendlyException("input参数不能为空");
+            }
+
+            //var patientRegister = _patientRegisterRepository.GetAsync(input.PatientRegisterId);
+            var list = (from chargeRequest in await _chargeRequestRepository.GetQueryableAsync()
+                        join chargeRequestAsbitem in await _chargeRequestAsbitemRepository.GetQueryableAsync()
+                        on chargeRequest.Id equals chargeRequestAsbitem.ChargeRequestId
+                        join asbitem in await _asbitemRepository.GetQueryableAsync()
+                        on chargeRequestAsbitem.AsbitemId equals asbitem.Id
+                        where chargeRequest.Id == input.ChargeRequestId
+                        select new
+                        {
+                            chargeRequest,
+                            chargeRequestAsbitem,
+                            asbitem
+                        }).ToList();
+            var result = list.Select(o => new ChargeRequestAsbitemDto()
+            {
+                AsbitemId = o.chargeRequest.Id,
+                AsbitemName = o.asbitem.DisplayName,
+                ChargePrice = o.chargeRequestAsbitem.ChargePrice,
+                Amount = o.chargeRequestAsbitem.Amount
+                
+
+            }).ToList();
+            return result;
+        }
+
+
     }
 }

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

@@ -225,6 +225,7 @@ namespace Shentun.Peis.PatientRegisters
 
                 entdto = new PatientRegisterOrNoDto
                 {
+                    HisPatientId = ent.HisPatientId,
                     Age = ent.Age,
                     AuditDate = DataHelper.ConversionDateToString(ent.AuditDate),
                     Id = ent.Id,

src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs

@@ -164,7 +164,7 @@ namespace Shentun.Peis.PrintReports
             //生成LIS条码
             var lisRequests = await _lisRequestManager.SetLisRequestAsync(input.PatientRegisterId);
             await _unitOfWorkManager.Current.SaveChangesAsync();
-            
+            //await _unitOfWorkManager.Current.CompleteAsync();
             
             //检索条码数据
 

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

@@ -350,6 +350,7 @@ namespace Shentun.Peis.RegisterAsbitems
 
             var entdto = entlist.Select(s => new RegisterCheckAsbitemOrAsbitemDto
             {
+                RegisterCheckAsbitemId = s.Id,
                 Discount = s.StandardPrice == 0 ? 100 : Math.Round(Convert.ToDecimal(s.ChargePrice * 100 / s.StandardPrice), 2),
                 IsLock = s.RegisterCheck.IsLock,
                 CreationTime = s.CreationTime,

src/Shentun.Peis.Domain/ChargeRequests/ChargeRequestManager.cs

@@ -1,4 +1,5 @@
-using Microsoft.Extensions.Configuration;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 using Shentun.Peis.Enums;
 using Shentun.Peis.Models;
 using Shentun.Peis.PlugIns;
@@ -20,6 +21,8 @@ namespace Shentun.Peis.ChargeRequests
     {
         private readonly IRepository<ChargeRequest, Guid> _repository;
         private readonly IRepository<PatientRegister, Guid> _patientRegisterRepository;
+        private readonly IRepository<RegisterCheck, Guid> _registerCheckRepository;
+        private readonly IRepository<RegisterCheckAsbitem, Guid> _registerCheckAsbitemRepository;
         private readonly IRepository<PrimarykeyBuilder> _primarykeyBuilderRepository;
         private readonly SysParmValueManager _sysParmValueManager;
         private readonly IRepository<ThirdInterface, Guid> _thirdInterfaceRepository;
@@ -27,14 +30,17 @@ namespace Shentun.Peis.ChargeRequests
             IRepository<PrimarykeyBuilder> primarykeyBuilderRepository,
             SysParmValueManager sysParmValueManager,
             IRepository<PatientRegister, Guid> patientRegisterRepository,
-            IRepository<ThirdInterface, Guid> thirdInterfaceRepository)
+            IRepository<ThirdInterface, Guid> thirdInterfaceRepository,
+            IRepository<RegisterCheck, Guid> registerCheckRepository,
+            IRepository<RegisterCheckAsbitem, Guid> registerCheckAsbitemRepository)
         {
             _repository = repository;
             _primarykeyBuilderRepository = primarykeyBuilderRepository;
             _sysParmValueManager = sysParmValueManager;
             _patientRegisterRepository = patientRegisterRepository;
             _thirdInterfaceRepository = thirdInterfaceRepository;
-
+            _registerCheckRepository = registerCheckRepository;
+            _registerCheckAsbitemRepository = registerCheckAsbitemRepository;
         }
         /// <summary>
         /// 创建
@@ -58,9 +64,27 @@ namespace Shentun.Peis.ChargeRequests
             };
         }
 
-        public async Task SendThirChargeRequestAsync(Guid id)
+        public async Task SendThirChargeRequestAsync(Guid id,string funName)
         {
-            var thirdInterfaces = (await _thirdInterfaceRepository.GetListAsync(o => o.ThirdInterfaceType == ThirdInterfaceTypeFlag.ChargeRequest))
+            //var patientRegisterEntity =  (from patientRegister in await _patientRegisterRepository.GetQueryableAsync()
+            //                                   join registerCheck in await _registerCheckRepository.GetQueryableAsync()
+            //                                   on patientRegister.Id equals registerCheck.PatientRegisterId
+            //                                   join registerCheckAsbitem in await _registerCheckAsbitemRepository.GetQueryableAsync()
+            //                                   on registerCheck.Id equals registerCheckAsbitem.RegisterCheckId
+            //                                   join chargeRequest in await _repository.GetQueryableAsync()
+            //                                   on registerCheckAsbitem.LisRequestId equals chargeRequest.Id
+            //                                   where chargeRequest.Id == id
+            //                                   select new
+            //                                   {
+            //                                       patientRegister
+            //                                   }).ToList().FirstOrDefault();
+            //if (patientRegisterEntity == null)
+            //{
+            //    return;
+            //}
+
+            var thirdInterfaces = (await _thirdInterfaceRepository.GetListAsync(o => o.ThirdInterfaceType == ThirdInterfaceTypeFlag.ChargeRequest
+                                  ))
                                    .OrderBy(o => o.DisplayOrder).ToList();
             foreach (var thirdInterface in thirdInterfaces)
             {
@@ -76,10 +100,11 @@ namespace Shentun.Peis.ChargeRequests
                 var assemblyName = config.GetSection("Interface").GetSection("AssemblyName").Value;
                 var className = config.GetSection("Interface").GetSection("ClassName").Value;
                 object[] objects = new object[] { chargeRequestPlugInsInput };
-                var chargeRequestPluginsOut = await InvokeAsync(assemblyName, className, parmValue, "SendRequest", objects);
+                var chargeRequestPluginsOut = await InvokeAsync(assemblyName, className, parmValue, funName, objects);
             }
         }
 
+       
         private async Task<ChargeRequestPlugInsOut> InvokeAsync(string assemblyName, string className, string classConstructorArg, string methodName, object[] args = null)
         {
             Assembly assembly = Assembly.Load(assemblyName);

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

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
+using Org.BouncyCastle.Asn1.Ocsp;
 using Shentun.Peis.Enums;
 using Shentun.Peis.Models;
 using Shentun.Peis.PlugIns;
@@ -11,6 +12,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp;
@@ -321,7 +323,24 @@ namespace Shentun.Peis.LisRequests
 
         public async Task SendThirdLisRequestAsync(Guid id)
         {
-            var thirdInterfaces = (await _thirdInterfaceRepository.GetListAsync(o => o.ThirdInterfaceType == ThirdInterfaceTypeFlag.LisRequest))
+           //var patientRegisterEntity = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync()
+           // join registerCheck in await _registerCheckRepository.GetQueryableAsync()
+           // on patientRegister.Id equals registerCheck.PatientRegisterId
+           // join registerCheckAsbitem in await _registerCheckAsbitemRepository.GetQueryableAsync()
+           // on registerCheck.Id equals registerCheckAsbitem.RegisterCheckId
+           // join lisRequest in await _lisRequestRepository.GetQueryableAsync()
+           // on  registerCheckAsbitem.LisRequestId equals  lisRequest.Id  
+           // where lisRequest.Id == id
+           // select new
+           // {
+           //     patientRegister
+           // }).ToList().FirstOrDefault();
+           // if(patientRegisterEntity == null)
+           // {
+           //     return;
+           // }
+            var thirdInterfaces = (await _thirdInterfaceRepository.GetListAsync(o => o.ThirdInterfaceType == ThirdInterfaceTypeFlag.LisRequest 
+                             ))
                                    .OrderBy(o => o.DisplayOrder).ToList();
             foreach (var thirdInterface in thirdInterfaces)
             {

src/Shentun.Peis.Domain/RegisterCheckItems/RegisterCheckItemManager.cs

@@ -150,7 +150,7 @@ namespace Shentun.Peis.RegisterCheckItems
             referenceRangeValue = referenceRangeValue.Replace("≧", ">=")
                                   .Replace("≥", ">=").Replace("≤", "<=").Replace("≦", "<=");
             var pos = referenceRangeValue.IndexOf("--");//兼容老系统
-            if (pos == 0)
+            if (pos <= 0)
             {
                 pos = referenceRangeValue.IndexOf("-");
             }

test/Shentun.Peis.Application.Tests/ChargeRequestAppServiceTest.cs

@@ -47,7 +47,7 @@ namespace Shentun.Peis
                 };
 
                 var newEntity = await _appService.CreateAsync(entity);
-                await unitOfWork.CompleteAsync();
+                //await unitOfWork.CompleteAsync();
             }
         }
     }

test/Shentun.Peis.Application.Tests/DiagnosisFunctionAppServiceTest.cs

@@ -156,35 +156,35 @@ namespace Shentun.Peis
             {
                 var getDiagnosisResultRequestDto = new GetDiagnosisResultRequestDto()
                 {
-                    RegisterCheckId = new Guid("3a11ee70-034c-1ce6-40f9-7eabb02830a9"),
+                    RegisterCheckId = new Guid("3a123c55-07a8-b330-ac9c-52e2a05e1dba"),
                     Items = new List<GetDiagnosisResultRequest_Item>
                     {
                         new GetDiagnosisResultRequest_Item()
                         {
-                            ItemId = new Guid("3a0d2916-3706-a22a-69dd-bd80be509d07"),
+                            ItemId = new Guid("3a1203c2-fde9-6f64-d268-54c7817fc9a4"),
                             Result = "30.5"
                         },
 
                         new GetDiagnosisResultRequest_Item()
                         {
-                            ItemId = new Guid("3a0d2919-49d5-30d3-4373-b3dc1e806732"),
+                            ItemId = new Guid("3a1203c2-fefd-b6cd-2933-84860f5af7b9"),
                             Result = "9"
                         },
                         new GetDiagnosisResultRequest_Item()
                         {
-                            ItemId = new Guid("3a0d2917-40e2-2f81-ebfc-267a9a98b02e"),
+                            ItemId = new Guid("3a1203c3-0017-e959-3735-5a3c71a9c70a"),
                             Result = "91.3"
                         },
                         new GetDiagnosisResultRequest_Item()
                         {
-                            ItemId = new Guid("3a0d291a-6ab5-8642-9cd3-30353ecb5d15"),
+                            ItemId = new Guid("3a1203c3-012e-1a2e-66a8-1829caf0cd64"),
                             Result = "90"
                         },
-                        new GetDiagnosisResultRequest_Item()
-                        {
-                            ItemId = new Guid("3a0d2918-344b-0373-a53c-b4888bd6b9a6"),
-                            Result = "13"
-                        },
+                        //new GetDiagnosisResultRequest_Item()
+                        //{
+                        //    ItemId = new Guid("3a0d2918-344b-0373-a53c-b4888bd6b9a6"),
+                        //    Result = "13"
+                        //},
                     }
                 };
                 var result = await _appService.GetDoctorCheckDiagnosisResultAsync(getDiagnosisResultRequestDto);