Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -1310,6 +1310,13 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.VacationService.GetIsVacation(IRaCIS.Application.Contracts.GetIsVacationInDto)">
+            <summary>
+            获取是否休假
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService">
             <summary>
             TrialEmailNoticeConfigService

IRaCIS.Core.Application/Service/Doctor/DTO/EducationModel.cs

@@ -31,8 +31,8 @@
     {
         public DateTime? CreateTime { get; set; }
 
-        public string BeginDateStr => BeginDate?.ToString("yyyy-MM");
+        public string BeginDateStr => BeginDate?.ToString("yyyy/MM");
-        public string EndDateStr => EndDate?.ToString("yyyy-MM");
+        public string EndDateStr => EndDate?.ToString("yyyy/MM");
 
     }
     public class PostgraduateCommand
@@ -81,9 +81,9 @@
     {
         public DateTime? CreateTime { get; set; }
 
-        public string BeginDateStr => BeginDate?.ToString("yyyy-MM");
+        public string BeginDateStr => BeginDate?.ToString("yyyy/MM");
 
-        public string EndDateStr => EndDate?.ToString("yyyy-MM");
+        public string EndDateStr => EndDate?.ToString("yyyy/MM");
     }
     public class DoctorEducationExperienceDTO
     {

IRaCIS.Core.Application/Service/Doctor/DTO/HolidayModel.cs

@@ -8,4 +8,15 @@
         public DateTime EndDate { get; set; }
         public int Status { get; set; } = 1;
     }
+
+    public class GetIsVacationInDto
+    {
+        public Guid DoctorId { get; set; }
+    }
+
+
+    public class GetIsVacationOutDto
+    {
+        public bool IsVacation { get; set; }
+    }
 }

IRaCIS.Core.Application/Service/Doctor/VacationService.cs

@@ -70,6 +70,36 @@ namespace IRaCIS.Core.Application.Service
 
         }
 
+        /// <summary>
+        /// 获取是否休假
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<GetIsVacationOutDto> GetIsVacation(GetIsVacationInDto inDto)
+        {
+            var query = await _vacationRepository.Where(u => u.DoctorId == inDto.DoctorId).ToListAsync();
+
+            bool isVacation = false;
+
+            var now = DateTime.Now;
+            foreach (var item in query)
+            {
+                if (item.StartDate <= now && now <= item.EndDate)
+                {
+                    isVacation = true;
+                    break;
+                }
+            }
+
+
+            return new GetIsVacationOutDto() { 
+            
+            IsVacation= isVacation
+            };
+
+        }
+
         [NonDynamicMethod]
         public async Task<IResponseOutput> OnVacation(Guid doctorId)
         {

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs

@@ -578,7 +578,8 @@ namespace IRaCIS.Core.Application.Service
                 "select","radio","class",
             };
             var questionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.ReadingQuestionCriterionTrialId)
-                   .Where(x => types.Contains(x.Type))
+                 .Where(x => types.Contains(x.Type)||(x.Type=="number"&&x.TypeValue!=string.Empty))
+               
                 .WhereIf(inDto.Id != null, x => x.Id != inDto.Id && x.ParentId != inDto.Id)
                  .Where(x => x.ReadingCriterionPageId == inDto.ReadingCriterionPageId)
 
@@ -672,10 +673,10 @@ namespace IRaCIS.Core.Application.Service
 
             var types = new List<string>()
             {
-                "select","radio"
+                "select","radio","class"
             };
             var questionList = await _readingTableQuestionTrialRepository.Where(x => x.ReadingQuestionId == inDto.ReadingQuestionId)
-                   .Where(x => types.Contains(x.Type))
+                   .Where(x => types.Contains(x.Type) || (x.Type == "number" && x.TypeValue != string.Empty))
                 .WhereIf(inDto.Id != null, x => x.Id != inDto.Id && x.ParentId != inDto.Id)
 
                 .Select(x => new CriterionOtherQuestionOutDto()