小程序退款

src/Shentun.ColumnReferencePlugIns/WebAppoints/CreateWeChatOrderRefundDto.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Shentun.Peis.PlugIns.WebAppoints
+{
+    public class CreateWeChatOrderRefundDto
+    {
+    }
+}

src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointPlugInsBase.cs

@@ -104,7 +104,7 @@ namespace Shentun.Peis.PlugIns.WebAppoints
         /// <param name="input"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public virtual async Task CreateWeChatOrderRefundAsync(CreateWeChatOrderRefundInputDto input)
+        public virtual async Task<CreateWeChatOrderRefundDto> CreateWeChatOrderRefundAsync(CreateWeChatOrderRefundInputDto input)
         {
             throw new NotImplementedException();
 

src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointWebPeisPlugIns.cs

@@ -193,10 +193,10 @@ namespace Shentun.Peis.PlugIns.WebAppoints
         /// <param name="input"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public override async Task CreateWeChatOrderRefundAsync(CreateWeChatOrderRefundInputDto input)
+        public override async Task<CreateWeChatOrderRefundDto> CreateWeChatOrderRefundAsync(CreateWeChatOrderRefundInputDto input)
         {
-            await CallWePeisAppServiceAsync<CreateWeChatOrderRefundInputDto, Task>
-                (_webPeisCreateWeChatOrderRefundUrl, input);
+          return  await CallWePeisAppServiceAsync<CreateWeChatOrderRefundInputDto, CreateWeChatOrderRefundDto>
+                 (_webPeisCreateWeChatOrderRefundUrl, input);
         }
 
         public async virtual Task<WebApiOutDto<LoginOutDataDto>> LoginWebPeisAsync()
@@ -325,6 +325,8 @@ namespace Shentun.Peis.PlugIns.WebAppoints
             }
         }
 
+      
+
         private async Task CheckWebPeisLoginAsync()
         {
             if (string.IsNullOrWhiteSpace(_webPeisToken))

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

@@ -11,6 +11,7 @@ using Shentun.Peis.Enums;
 using Shentun.Peis.Models;
 using Shentun.Peis.PatientRegisters;
 using Shentun.Peis.PlugIns;
+using Shentun.Peis.PlugIns.WebAppoints;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -319,7 +320,7 @@ namespace Shentun.Peis.AppointPatientRegisters
             var assemblyName = config.GetSection("Interface").GetSection("AssemblyName").Value;
             var className = config.GetSection("Interface").GetSection("ClassName").Value;
 
-            await Utilities.ReflectionHelper.InvokeAsync<Task>(assemblyName,
+            await Utilities.ReflectionHelper.InvokeAsync<CreateWeChatOrderRefundDto>(assemblyName,
               className, [thirdInterface.Id], "CreateWeChatOrderRefundAsync", objects);
         }
 
@@ -349,7 +350,7 @@ namespace Shentun.Peis.AppointPatientRegisters
         /// </summary>
         /// <returns></returns>
         [HttpPost("api/app/AppointPatientRegister/UpdateAppointPatientAsbitemStatus")]
-        public async Task UpdateAppointPatientAsbitemStatusAsync(UpdateAppointPatientAsbitemStatusInputDto input)
+        public async Task<bool> UpdateAppointPatientAsbitemStatusAsync(UpdateAppointPatientAsbitemStatusInputDto input)
         {
             var registerCheckAsbitemList = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync()
                                             join registerCheck in await _registerCheckRepository.GetQueryableAsync() on patientRegister.Id equals registerCheck.PatientRegisterId
@@ -366,11 +367,14 @@ namespace Shentun.Peis.AppointPatientRegisters
                     if (inputPara != null)
                     {
                         registerCheckAsbitem.IsCharge=inputPara.IsCharge;
+                        registerCheckAsbitem.ChargeSourceFlag = null;
                     }
                 }
 
                 await _registerCheckAsbitemRepository.UpdateManyAsync(registerCheckAsbitemList);
             }
+
+            return true;
         }
 
         #endregion

src/Shentun.Peis.Application/BigtextResultTemplates/BigtextResultTemplateAppService.cs

@@ -236,7 +236,6 @@ namespace Shentun.Peis.BigtextResultTemplates
                          join bigtextResultDescription in await _bigtextResultDescriptionRepository.GetQueryableAsync() on bigtextResultTemplate.Id equals bigtextResultDescription.BigtextResultTemplateId into bigtextResultDescriptionTemp
                          from bigtextResultDescriptionHaveEmpty in bigtextResultDescriptionTemp.DefaultIfEmpty()
                          where itemBigtextResultType.ItemId == input.ItemId
-                         && bigtextResultConclusionHaveEmpty.IsAbnormal == 'Y'
                          orderby bigtextResultTemplate.DisplayOrder ascending
                          select new
                          {
@@ -254,7 +253,7 @@ namespace Shentun.Peis.BigtextResultTemplates
                 BigtextResultTypeName = s.FirstOrDefault().bigtextResultTypeName,
                 BigtextResultTemplateName = s.FirstOrDefault().bigtextResultTemplateName,
                 bigtextResultDescription = string.Join("；", s.Where(m => m.bigtextResultDescriptionHaveEmpty != null).Select(ss => ss.bigtextResultDescriptionHaveEmpty.Description).Distinct()),
-                bigtextResultConclusion = string.Join("；", s.Where(m => m.bigtextResultConclusionHaveEmpty != null).Select(ss => ss.bigtextResultConclusionHaveEmpty.Conclusion).Distinct())
+                bigtextResultConclusion = string.Join("；", s.Where(m => m.bigtextResultConclusionHaveEmpty != null && m.bigtextResultConclusionHaveEmpty.IsAbnormal == 'Y').Select(ss => ss.bigtextResultConclusionHaveEmpty.Conclusion).Distinct())
             }).ToList();
 
             return entListDto;

src/Shentun.Peis.Application/OccupationalDiseaseReports/OccupationalDiseaseReportAppService.cs

@@ -711,7 +711,7 @@ namespace Shentun.Peis.OccupationalDiseaseReports
                 #region 体检结果总结
 
                 msg.MedicalResultDesc = $"{Convert.ToDateTime(customerOrgPara.StartDate).ToString("yyyy-MM-dd")}，{msg.CustomerOrgName}组织{sumCount}名接触" +
-                    $"{1}作业工人进行职业健康检查。";
+                    $"特种作业工人进行职业健康检查。";
 
                 var occupationalAbnormalDetails = new List<GetCompanyOccupationalDiseaseDetailReportOccupationalAbnormalDetailDto>();
                 occupationalAbnormalDetails.Add(new GetCompanyOccupationalDiseaseDetailReportOccupationalAbnormalDetailDto

src/Shentun.Peis.Application/SmallProgramCharges/SmallProgramChargeAppService.cs

@@ -1,51 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Shentun.Peis.Models;
-using Shentun.Peis.PatientRegisters;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Domain.Repositories;
-
-namespace Shentun.Peis.SmallProgramCharges
-{
-    /// <summary>
-    /// 小程序收费
-    /// </summary>
-    [ApiExplorerSettings(GroupName = "Work")]
-    [Authorize]
-    public class SmallProgramChargeAppService : ApplicationService
-    {
-        private readonly IRepository<PatientRegister,Guid>  _patientRegisterRepository;
-        private readonly IRepository<RegisterCheck,Guid>  _registerCheckRepository;
-        private readonly IRepository<RegisterCheckAsbitem,Guid> _registerCheckAsbitemRepository;
-
-        public SmallProgramChargeAppService(
-            IRepository<PatientRegister, Guid> patientRegisterRepository,
-            IRepository<RegisterCheck, Guid> registerCheckRepository,
-            IRepository<RegisterCheckAsbitem, Guid> registerCheckAsbitemRepository
-            )
-        {
-            _patientRegisterRepository = patientRegisterRepository;
-            _registerCheckRepository = registerCheckRepository;
-            _registerCheckAsbitemRepository = registerCheckAsbitemRepository;
-        }
-
-
-        /// <summary>
-        /// 获取小程序收费过的人员
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost("api/app/SmallProgramCharge/GetChargePatientRegisterList")]
-        public async Task<PagedResultDto<GetPatientRegisterChargeListDto>> GetChargePatientRegisterListAsync(PatientRegisterChargeRequestDto input)
-        { 
-        
-        }
-
-        
-    }
-}