diff --git a/24Hour/Controllers/Common/CommonController.cs b/24Hour/Controllers/Common/CommonController.cs
index 80a0460..401aa49 100644
--- a/24Hour/Controllers/Common/CommonController.cs
+++ b/24Hour/Controllers/Common/CommonController.cs
@@ -393,6 +393,33 @@ namespace _24Hour.Controllers.Common
             return result;
         }
         /// <summary>
+        /// 检察官待办查询
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("CountReservationInfoByProsecutor")]
+        public async Task<Result> CountReservationInfoByProsecutor()
+        {
+            try
+            {
+                var lawyerdata = await _db.Queryable<App_LawyerServicesModel>()
+                    .Where(x => x.state == 0)
+                    .Where(x => x.IsDeleted == 0)
+                    .CountAsync();
+                result.result = new
+                {
+                    Count = lawyerdata,
+                };
+                result.IsSucceed = true;
+            }
+            catch (Exception)
+            {
+                result.IsSucceed = false;
+                throw;
+            }
+            return result;
+        }
+        /// <summary>
         /// 修改预约申请状态
         /// </summary>
         /// <param name="id"></param>
diff --git a/24Hour/Controllers/Common/LawyerArchivesController.cs b/24Hour/Controllers/Common/LawyerArchivesController.cs
index 1ef92f6..39d3ad3 100644
--- a/24Hour/Controllers/Common/LawyerArchivesController.cs
+++ b/24Hour/Controllers/Common/LawyerArchivesController.cs
@@ -362,12 +362,12 @@ namespace _24Hour.Controllers.Common
         {
             try
             {
-                var lawsvc =await _db.Queryable<App_LawyerServicesModel>().Where(x => x.Id == dto.Id).FirstAsync();
-                if (lawsvc==null)
+                var lawsvc = await _db.Queryable<App_LawyerServicesModel>().Where(x => x.Id == dto.lawyerserviceId).FirstAsync();
+                if (lawsvc == null)
                 {
                     return Result.Error("预约信息不存在");
                 }
-                if (lawsvc.IsAssigned==true)
+                if (lawsvc.IsAssigned == true)
                 {
                     return Result.Error("当前预约信息已被分配");
                 }
@@ -846,16 +846,43 @@ namespace _24Hour.Controllers.Common
             try
             {
                 var lawyerArchives = await _db.Queryable<LawyerArchives>().Where(x => x.Id == lawyerarchivesId).FirstAsync();
-                var lawyersvc = await _db.Queryable<App_LawyerServicesModel>().Where(x => x.Id == lawyerArchives.Id).FirstAsync();
+                var lawyersvc = await _db.Queryable<App_LawyerServicesModel>().Where(x => x.Id == lawyerArchives.lawyerserviceId).FirstAsync();
                 var lawyer = await _db.Queryable<App_Sys_UserModel>().Where(x => x.Id == lawyerArchives.lawyerId).FirstAsync();
                 var departmenginfo = await _db.Queryable<App_Sys_UnitModel>().Where(x => x.unitCode == _userdata.unitCode).FirstAsync();
                 logger.LogInformation($"get lawyerarchivesinfo:{lawyerArchives.ConvertToJsonStr()}");
                 logger.LogInformation($"get lawyersvcinfo:{lawyersvc.ConvertToJsonStr()}");
                 logger.LogInformation($"get lawyerinfo:{lawyer.ConvertToJsonStr()}");
                 logger.LogInformation($"get departmenginfo:{departmenginfo.ConvertToJsonStr()}");
+
+                var bmsah= lawyerArchives.bmsah;
+                var partyIDcard = lawyersvc.partyIDcard;
+                var party = lawyersvc.party;
+                var identitycardId = lawyer.identitycardId;
+                var lawyerphone = lawyer.phone;
+                var mandator = lawyersvc.mandator;
+                var lawyerdepartmentUnifiedSocialCreditCode = lawyer.departmentUnifiedSocialCreditCode;
+                var relationship = lawyersvc.relationship;
+                var permissibleStartTime = lawyerArchives.permissibleStartTime?.ToString("yyyy-MM-dd");
+                var permissibleEndTime = lawyerArchives.permissibleEndTime?.ToString("yyyy-MM-dd");
+
+                //if (true)
+                //{
+                //    bmsah = "安北检刑诉受[2023]410503000002号";
+                //    partyIDcard = "410502199606164872";
+                //    party = "李四";
+                //    identitycardId = "123445788876677";
+                //    lawyerphone = "1234";
+                //    mandator = "张三";
+                //    lawyerdepartmentUnifiedSocialCreditCode = "123123123";
+                //    relationship = "本人";
+                //    permissibleStartTime = "2023-11-11";
+                //    permissibleEndTime = "2023-12-11";
+                //}
+
+
                 var UnitCode = _userdata.unitCode;
                 var UnitName = departmenginfo.unitjc;
-                var querylawyer = await QueryLsList(lawyer.identitycardId);
+                var querylawyer = await QueryLsList(identitycardId);
                 #region 数据检查
                 if (querylawyer.IsSucceed == true)
                 {
@@ -873,7 +900,7 @@ namespace _24Hour.Controllers.Common
                     return result;
                 }
 
-                var querydsr = await QueryDsrList(lawyerArchives.bmsah, UnitCode, lawyersvc.partyIDcard);
+                var querydsr = await QueryDsrList(bmsah, UnitCode, partyIDcard);
                 if (querydsr.IsSucceed == true)
                 {
                     if (querydsr.result.list.Count <= 0)
@@ -910,23 +937,23 @@ namespace _24Hour.Controllers.Common
                 #endregion
                 var registerinforequest = await Register(new RegisterDto()
                 {
-                    Bmsah = lawyerArchives.bmsah,
+                    Bmsah = bmsah,
                     UnitCode = UnitCode,
                     UnitName = UnitName,
-                    PartyIdCard = lawyersvc.partyIDcard,
-                    PartyConsignor = lawyersvc.party,
-                    ProposerZJHM = lawyer.identitycardId,
+                    PartyIdCard = partyIDcard,
+                    PartyConsignor = party,
+                    ProposerZJHM = identitycardId,
                     ProposerType = "",
-                    ProposerTel = lawyer.phone,
-                    ProposerSCC = lawyer.departmentUnifiedSocialCreditCode,
-                    Wtr = lawyersvc.mandator,
-                    Wtrydsrgxdm = lawyersvc.relationship switch
+                    ProposerTel = lawyerphone,
+                    ProposerSCC = lawyerdepartmentUnifiedSocialCreditCode,
+                    Wtr = mandator,
+                    Wtrydsrgxdm = relationship switch
                     {
                         "监护人" => "1424000000300",
                         "近亲属" => "1424000000200",
                         _ => "1424000000100"
                     },
-                    Wtrydsrgxmc = lawyersvc.relationship switch
+                    Wtrydsrgxmc = relationship switch
                     {
                         "监护人" => "监护人",
                         "近亲属" => "近亲属",
@@ -940,6 +967,45 @@ namespace _24Hour.Controllers.Common
                 if (registerinforequest.IsSucceed == true)
                 {
                     var registerinfo = registerinforequest.result;
+                    var UploadPhoto = async (string? photoarr, string? typecode) =>
+                    {
+                        if (string.IsNullOrEmpty(photoarr) || string.IsNullOrEmpty(typecode))
+                            return;
+                        var identityphotos = photoarr?.ConvertToModel<List<string>>();
+                        if (identityphotos?.Any() == true)
+                        {
+                            foreach (var item in identityphotos)
+                            {
+                                var filepath = Path.Combine(Environment.CurrentDirectory, item);
+                                filepath = filepath.Replace(@"/", @"\");
+                                await twentyClient.UploadImage(new UploadDto()
+                                {
+                                    Bmsah = registerinfo.bmsah,
+                                    FileName = Path.GetFileName(filepath),
+                                    Code = typecode,
+                                    UnitCode = registerinfo.dwbm,
+                                    UnitName = UnitName,
+                                    ImageStr = Convert.ToBase64String(Encoding.UTF8.GetBytes(System.IO.File.ReadAllText(filepath)))
+                                });
+                            }
+                        }
+                    };
+                    /// 1423000000100-律师执业证书,1423000000200-律师事务所证, 1423000000300-  授权委托书, 1423000000400-  法律援助公函,1423000000500-身份证件 ,1423000000600-关系证明材料, 1423000000700- 其他 
+
+                    await Task.WhenAll(
+                        UploadPhoto(lawyer.identityphoto, "1423000000100"),
+                        UploadPhoto(lawyer.departmentPhoto, "1423000000200"),
+                        UploadPhoto(lawyersvc.annex, "1423000000300"),
+                        UploadPhoto(lawyersvc.legalAidPhoto, "1423000000400"),
+                        UploadPhoto(lawyer.cardIdphoto, "1423000000500"),
+                        UploadPhoto(lawyersvc.relationshipProofPhoto, "1423000000600"),
+                        UploadPhoto(lawyersvc.otherPhoto, "1423000000700")
+                        )
+                        .ContinueWith((x) =>
+                        {
+                            logger.LogInformation("图片上传成功");
+                        });
+
                     var applymarkingrequest = await ApplyMarKing(new()
                     {
                         bhdlbh = registerinfo.bhdlbh,
@@ -956,7 +1022,7 @@ namespace _24Hour.Controllers.Common
                         sqrsfdm = registerinfo.bhdlYxSqrInsertInputDto.sqrsfdm,
                         sxlxdm = "1405187400001",
                         sxlxmc = "申请阅卷",
-                        zrrmc = lawyersvc.party
+                        zrrmc = party
                     });
 
                     if (applymarkingrequest.IsSucceed == true)
@@ -975,8 +1041,8 @@ namespace _24Hour.Controllers.Common
                             sxbh = applymarkinginfo.sxbh,
                             yjfsdm = "",
                             yjfsmc = "",
-                            yjjzsj = lawyerArchives.permissibleStartTime?.ToString("yyyy-MM-dd"),
-                            yjkssj = lawyerArchives.permissibleEndTime?.ToString("yyyy-MM-dd"),
+                            yjjzsj = permissibleStartTime,
+                            yjkssj = permissibleEndTime,
                         });
                         if (Arrangerequest.IsSucceed == true)
                         {
@@ -2001,6 +2067,8 @@ namespace _24Hour.Controllers.Common
 
             return result;
         }
+
+    
         public class DecodeQRDataModel
         {
             public string QRData { get; set; }
@@ -2065,4 +2133,4 @@ namespace _24Hour.Controllers.Common
         //}
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/24Hour/Controllers/Common/LawyerservicesController.cs b/24Hour/Controllers/Common/LawyerservicesController.cs
index 742f41f..31b3f37 100644
--- a/24Hour/Controllers/Common/LawyerservicesController.cs
+++ b/24Hour/Controllers/Common/LawyerservicesController.cs
@@ -85,16 +85,23 @@ namespace _24Hour.Controllers.Common
         public async Task<Result> QueryLawyer(App_LawyerServicesInput Lawyerdata)
         {
             RefAsync<int> totalNumber = 0;//总数据
+
+
             //查询律师服务
             var list = await _db.Queryable<App_LawyerServicesModel>()
+                .Where(q => q.IsDeleted == 0)
                 .WhereIF(Lawyerdata?.name != null, q => q.name.Contains(Lawyerdata.name))
                 .WhereIF(Lawyerdata?.objectstr != null, q => q.objectstr.Contains(Lawyerdata.objectstr))
                 .WhereIF(Lawyerdata?.unitId != null, q => q.unitCode.Contains(Lawyerdata.unitId))
                 .WhereIF(Lawyerdata?.state != null, q => q.state == Lawyerdata.state)
                 .WhereIF(Lawyerdata?.StartTime != null && Lawyerdata.EndTime != null, q => q.receptiontime >= Lawyerdata.StartTime && q.receptiontime < Lawyerdata.EndTime.Value.AddDays(1))
-                .Where(q => q.IsDeleted == 0)
+
+                .WhereIF(string.IsNullOrEmpty(Lawyerdata.Id) == false, q => q.Id == Lawyerdata.Id)
+
                 .WhereIF(_userdata.phone != "admin", q => q.unitCode == _userdata.unitCode)
-                .OrderByDescending(q => q.creationtime).ToPageListAsync(Lawyerdata.PageIndex, Lawyerdata.PageSize, totalNumber);
+                .OrderByDescending(q => q.creationtime)
+                .ToPageListAsync(Lawyerdata.PageIndex, Lawyerdata.PageSize, totalNumber);
+
             Lawyerdata.RowsCount = totalNumber;
             var data = new QueryResult<App_LawyerServicesModel>(Lawyerdata, list.OrderByDescending(q => q.creationtime).ToList());
             result.IsSucceed = true;