收费

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

@@ -166,10 +166,9 @@ namespace Shentun.Peis.ChargeRequests
                 throw new UserFriendlyException("input参数不能为空");
             }
             var chargeRequest = await _chargeRequestRepository.GetAsync(input.ChargeRequestId);
-            if (chargeRequest.ChargeRequestFlag != ChargeRequestFlag.ChargeRequest &&
-                chargeRequest.ChargeRequestFlag != ChargeRequestFlag.CancelChargeRequest)
+            if (chargeRequest.ChargeRequestFlag != ChargeRequestFlag.AlreadyCharge)
             {
-                throw new UserFriendlyException("状态不是收费申请和作废申请，不允许退费申请");
+                throw new UserFriendlyException("状态不是已收费，不允许退费申请");
             }
                 await _chargeRequestManager.SendThirChargeRequestAsync(input.ChargeRequestId, "RefundRequestAsync");
 

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

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