diff --git a/src/Shentun.ColumnReferencePlugIns/WebAppoints/CreateWeChatOrderRefundDto.cs b/src/Shentun.ColumnReferencePlugIns/WebAppoints/CreateWeChatOrderRefundDto.cs
new file mode 100644
index 0000000..b2bc1bf
--- /dev/null
+++ b/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
+ {
+ }
+}
diff --git a/src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointPlugInsBase.cs b/src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointPlugInsBase.cs
index c490c70..5323674 100644
--- a/src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointPlugInsBase.cs
+++ b/src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointPlugInsBase.cs
@@ -104,7 +104,7 @@ namespace Shentun.Peis.PlugIns.WebAppoints
///
///
///
- public virtual async Task CreateWeChatOrderRefundAsync(CreateWeChatOrderRefundInputDto input)
+ public virtual async Task CreateWeChatOrderRefundAsync(CreateWeChatOrderRefundInputDto input)
{
throw new NotImplementedException();
diff --git a/src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointWebPeisPlugIns.cs b/src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointWebPeisPlugIns.cs
index fed45ed..65959ed 100644
--- a/src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointWebPeisPlugIns.cs
+++ b/src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointWebPeisPlugIns.cs
@@ -193,10 +193,10 @@ namespace Shentun.Peis.PlugIns.WebAppoints
///
///
///
- public override async Task CreateWeChatOrderRefundAsync(CreateWeChatOrderRefundInputDto input)
+ public override async Task CreateWeChatOrderRefundAsync(CreateWeChatOrderRefundInputDto input)
{
- await CallWePeisAppServiceAsync
- (_webPeisCreateWeChatOrderRefundUrl, input);
+ return await CallWePeisAppServiceAsync
+ (_webPeisCreateWeChatOrderRefundUrl, input);
}
public async virtual Task> LoginWebPeisAsync()
@@ -325,6 +325,8 @@ namespace Shentun.Peis.PlugIns.WebAppoints
}
}
+
+
private async Task CheckWebPeisLoginAsync()
{
if (string.IsNullOrWhiteSpace(_webPeisToken))
diff --git a/src/Shentun.Peis.Application/AppointPatientRegisters/AppointPatientRegisterAppService.cs b/src/Shentun.Peis.Application/AppointPatientRegisters/AppointPatientRegisterAppService.cs
index 8124e78..62518e4 100644
--- a/src/Shentun.Peis.Application/AppointPatientRegisters/AppointPatientRegisterAppService.cs
+++ b/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(assemblyName,
+ await Utilities.ReflectionHelper.InvokeAsync(assemblyName,
className, [thirdInterface.Id], "CreateWeChatOrderRefundAsync", objects);
}
@@ -349,7 +350,7 @@ namespace Shentun.Peis.AppointPatientRegisters
///
///
[HttpPost("api/app/AppointPatientRegister/UpdateAppointPatientAsbitemStatus")]
- public async Task UpdateAppointPatientAsbitemStatusAsync(UpdateAppointPatientAsbitemStatusInputDto input)
+ public async Task 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
diff --git a/src/Shentun.Peis.Application/BigtextResultTemplates/BigtextResultTemplateAppService.cs b/src/Shentun.Peis.Application/BigtextResultTemplates/BigtextResultTemplateAppService.cs
index bce4b62..013cee5 100644
--- a/src/Shentun.Peis.Application/BigtextResultTemplates/BigtextResultTemplateAppService.cs
+++ b/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;
diff --git a/src/Shentun.Peis.Application/OccupationalDiseaseReports/OccupationalDiseaseReportAppService.cs b/src/Shentun.Peis.Application/OccupationalDiseaseReports/OccupationalDiseaseReportAppService.cs
index fe6eeeb..7c4695e 100644
--- a/src/Shentun.Peis.Application/OccupationalDiseaseReports/OccupationalDiseaseReportAppService.cs
+++ b/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();
occupationalAbnormalDetails.Add(new GetCompanyOccupationalDiseaseDetailReportOccupationalAbnormalDetailDto
diff --git a/src/Shentun.Peis.Application/SmallProgramCharges/SmallProgramChargeAppService.cs b/src/Shentun.Peis.Application/SmallProgramCharges/SmallProgramChargeAppService.cs
deleted file mode 100644
index ef08a67..0000000
--- a/src/Shentun.Peis.Application/SmallProgramCharges/SmallProgramChargeAppService.cs
+++ /dev/null
@@ -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
-{
- ///
- /// 小程序收费
- ///
- [ApiExplorerSettings(GroupName = "Work")]
- [Authorize]
- public class SmallProgramChargeAppService : ApplicationService
- {
- private readonly IRepository _patientRegisterRepository;
- private readonly IRepository _registerCheckRepository;
- private readonly IRepository _registerCheckAsbitemRepository;
-
- public SmallProgramChargeAppService(
- IRepository patientRegisterRepository,
- IRepository registerCheckRepository,
- IRepository registerCheckAsbitemRepository
- )
- {
- _patientRegisterRepository = patientRegisterRepository;
- _registerCheckRepository = registerCheckRepository;
- _registerCheckAsbitemRepository = registerCheckAsbitemRepository;
- }
-
-
- ///
- /// 获取小程序收费过的人员
- ///
- ///
- [HttpPost("api/app/SmallProgramCharge/GetChargePatientRegisterList")]
- public async Task> GetChargePatientRegisterListAsync(PatientRegisterChargeRequestDto input)
- {
-
- }
-
-
- }
-}