双向转诊模块随访系统模块 报修平台协同人模块功能修改优化

代码/MadRunFabric.EquipmentApi/EquipmentApi/Controllers/workordermanage/WoRepairBaseController.cs

@@ -3256,7 +3256,7 @@ namespace EquipmentApi.Controllers.workordermanage
             string optusername = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name).Value;
 
             var userstr = _signTokenService.GetUserInfoAsync(optuser).Result;
-            // var userinfo = userstr.ToJObject()["data"].ToString().ToObject<UserInfoModel>();
+             var userinfo = userstr.ToJObject()["data"].ToString().ToObject<UserInfoModel>();
 
             var cls = await _wo_repair_baseRepository.Get(p => p.wocode == wocode && p.isdelete == 0);
             var clmodel = cls.FirstOrDefault();
@@ -3278,15 +3278,18 @@ namespace EquipmentApi.Controllers.workordermanage
                         {
                             if (!clmodel.dealuser.Contains(struser))
                             {
-                                var dealuserstr = _signTokenService.GetUserInfoAsync(optuser).Result;
-                                var dealuserinfo = userstr.ToJObject()["data"].ToString().ToObject<UserInfoModel>();
+                                ////var dealuserstr = _signTokenService.GetUserInfoAsync(optuser).Result;
+                                //var dealuserstr = _signTokenService.GetUserInfoAsync(optuser).Result;
+                                //var dealuserinfo = struser.ToJObject()["data"].ToString().ToObject<UserInfoModel>();
+
+                                var xtruserinfo =await _sys_user_accountRepository.GetSingle(p => p.usercode == struser);
 
                                 //dealcodes.Add(dealuserinfo.usercode);
                                 //dealnames.Add(dealuserinfo.username);
-                                clmodel.dealuser.Add(optuser);
-                                clmodel.dealusername.Add(optusername);
+                                clmodel.dealuser.Add(xtruserinfo.usercode);
+                                clmodel.dealusername.Add(xtruserinfo.username);
 
-                                dealuserinfos = dealuserinfos + "、" + dealuserinfo.usercode + "-" + dealuserinfo.username;
+                                dealuserinfos = dealuserinfos + "、" + xtruserinfo.usercode + "-" + xtruserinfo.username;
                             }
                         }
                     }
@@ -3338,7 +3341,15 @@ namespace EquipmentApi.Controllers.workordermanage
                     clmodel.faulttypeid = faulttypeid;
                     clmodel.systemid = systemid;
                     //clmodel.equipmentid = equipmentid;
-                    clmodel.CLpeoplefrom = CLpeoplefrom;
+                    if (userinfo.username.Contains("第三方"))
+                    {
+                        clmodel.CLpeoplefrom = "第三方";
+                    }
+                    else
+                    {
+                        clmodel.CLpeoplefrom = CLpeoplefrom;
+                    }
+                    
                     if(wxtimeid!=null&&wxtimeid!="")
                     {
                         clmodel.wxtimeid = wxtimeid;
@@ -3483,7 +3494,7 @@ namespace EquipmentApi.Controllers.workordermanage
         [HttpPost("assignbz")]
         public async Task<IActionResult> UpdateAssignAsync1(string wocode, string assignman, string assignremark, int channel = 1)
         {
-            string optuser = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+            string optuser =User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
             string optusername = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name).Value;
             var cls = await _wo_repair_baseRepository.Get(p => p.wocode == wocode && p.isdelete == 0);
             var clmodel = cls.FirstOrDefault();

代码/MadRunFabric.EquipmentApi/EquipmentApi/EquipmentApi.csproj

@@ -20,6 +20,7 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="6.2.2" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="3.2.0" />
+    <PackageReference Include="IgetuiServerApiSDK.Core" Version="1.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="2.1.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.0" />

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi.IRepositories/Iv_csm_zhuyuanRepository.cs

@@ -1,12 +1,16 @@
 using MadRunFabric.Common.IRepositories;
 using MadRunFabric.Model.TestUserTypeApi;
+using SqlSugar;
 using System;
 using System.Collections.Generic;
+using System.Common;
 using System.Text;
+using System.Threading.Tasks;
 
 namespace TestUserTypeApi.IRepositories
 {
     public interface Iv_csm_zhuyuanRepository : IOracleRepository<V_CSM_ZHUYUAN>
     {
+        Task<PageData<V_CSM_ZHUYUAN>> GetListViewByPage(List<IConditionalModel> conModels, MyPageModel pagemodel, string nowdatetime, string orderby);
     }
 }

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi.Model/Dto/HzsfMassages.cs

@@ -20,6 +20,10 @@ namespace TestUserTypeApi.Model.Dto
         /// </summary>
         public string sendmyeds { get; set; }
         /// <summary>
+        /// 不满意原因
+        /// </summary>
+        public string nomybecause { get; set; }
+        /// <summary>
         /// 发送时间
         /// </summary>
         public DateTime? senddate { get; set; }

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi.Model/Dto/exportexcelszzy.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TestUserTypeApi.Model.Dto
+{
+  public   class exportexcelszzy
+    {
+        #region MyRegion
+        public DateTime? Szzydjsj { get; set; }//登记时间
+        public string Szzyzzdw { get; set; }//转诊单位
+        public string Szzyzzys { get; set; }//转诊医师
+        public string Yslxfs   { get; set; }///联系方式
+        public string Hzname   { get; set; }//患者姓名
+        public string HzGender { get; set; }//患者性别
+        public string Hzage    { get; set; }//患者年龄
+        public string Hzzd     { get; set; }//患者诊断
+        public string Hzzyks   { get; set; }//住院科室
+        public string Hzzyh    { get; set; }//住院号
+        public string Hzlxfs   { get; set; }//联系方式
+        public string Syzzzzmd { get; set; }//转诊目的
+        public DateTime? Syzysj   { get; set; }//住院时间
+        public string Syzyfy   { get; set; }//住院费用
+        public string Syzzzrr  { get; set; }//责任人
+        public string Syzzzzfw { get; set; }//诊中服务
+        public string Syzzzrrs { get; set; }//责任人
+        #endregion
+    }
+}

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi/Controllers/TestController.cs

@@ -67,10 +67,10 @@ namespace TestUserTypeApi.Controllers
                 nowdatetime = DateTime.Now.AddDays(-3).ToString("yyyy-MM-dd");
             }
             conModels.Add(new ConditionalModel() { FieldName = "CY_DATE", ConditionalType = ConditionalType.Equal, FieldValue = nowdatetime });
-            conModels.Add(new ConditionalModel() { FieldName = "IS_OP", ConditionalType = ConditionalType.IsNot, FieldValue ="1"  });
+            //conModels.Add(new ConditionalModel() { FieldName = "IS_OP", ConditionalType = ConditionalType.IsNot, FieldValue ="1"  });
             int recordCount = 0;
-            // var list = await _cus_CustomerRepository.GetListViewByPage(conModels, new MyPageModel() { PageIndex = pageindex, PageSize = pagesize, PageCount = recordCount }, "F_CreateOn desc");
-            var list = await _Iv_csm_zhuyuanRepository.GetListByPage(conModels, new MyPageModel() { PageIndex = PageIndex, PageSize = PageSize, PageCount = recordCount }, "zy_no desc");
+            var list = await _Iv_csm_zhuyuanRepository.GetListViewByPage(conModels, new MyPageModel() { PageIndex = PageIndex, PageSize = PageSize, PageCount = recordCount }, nowdatetime, "zy_no desc");
+            // var list = await _Iv_csm_zhuyuanRepository.GetListByPage(conModels, new MyPageModel() { PageIndex = PageIndex, PageSize = PageSize, PageCount = recordCount }, "zy_no desc");
             var obj = new
             {
                 state = "success",
@@ -80,6 +80,25 @@ namespace TestUserTypeApi.Controllers
 
             return Success("成功", obj);
         }
+        /// <summary>
+        /// 根据手机号和住院时间
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet("gethzxxsbyid")]
+        public async Task<IActionResult> GetSzmzsbyid(string telphone,string nowdatetime)
+        {
+            if (nowdatetime != null)
+            {
+                nowdatetime = Convert.ToDateTime(nowdatetime).AddDays(-3).ToString("yyyy-MM-dd");
+            }
+            else
+            {
+                nowdatetime = DateTime.Now.AddDays(-3).ToString("yyyy-MM-dd");
+            }
+            var model = await _Iv_csm_zhuyuanRepository.GetSingle(p => p.CY_DATE == nowdatetime && p.PAT_PHONE == telphone);
+            return Success("成功", model);
+        }
 
         /// <summary>
         /// 获取出院患者短信发送记录
@@ -88,6 +107,7 @@ namespace TestUserTypeApi.Controllers
         [HttpGet("getsendhfinfo")]
         public async Task<IActionResult> GetSendhfinfo(int PageIndex, int PageSize,string key, string yqinfo, string sendmydcent)
         {
+            var sort = Builders<HzsfMassages>.Sort.Descending("senddate");
             var listApp = new List<FilterDefinition<HzsfMassages>>();
             listApp.Add(Builders<HzsfMassages>.Filter.Eq("isdelete", 0));
             if (key != null && key != "")
@@ -123,7 +143,7 @@ namespace TestUserTypeApi.Controllers
             }
             var filter = Builders<HzsfMassages>.Filter.And(listApp);
 
-            var list = await _IHzsfMassagesRepository.GetByPage(filter, PageIndex, PageSize);
+            var list = await _IHzsfMassagesRepository.GetByPage(filter, PageIndex, PageSize,sort);
             var redCount = await _IHzsfMassagesRepository.CountAsync(filter);   //获取总数
             var listmodel = new List<HzsfMassages>();
             foreach (var item in list)
@@ -194,6 +214,29 @@ namespace TestUserTypeApi.Controllers
             }
 
         }
+        /// <summary>
+        /// 修改不满意原因
+        /// </summary>
+        /// <param name="tps"></param>
+        /// <returns></returns>
+        [HttpGet("upbecausehfinfo")]
+        public async Task<IActionResult> upbecausehfinfo(Model.Dto.HzsfMassages tps)
+        {
+            HzsfMassages tp = await _IHzsfMassagesRepository.GetSingle(p => p.id == tps.id);
+           
+            tp.nomybecause = tps.nomybecause; // 不满意原因
+            
+            var resua = _IHzsfMassagesRepository.UpdateOne(tp);
+            if (resua.Result)
+            {
+                return Success("成功");
+            }
+            else
+            {
+                return Error("失败");
+            }
+
+        }
 
         /// <summary>
         /// 添加给出院患者发送短信记录
@@ -201,106 +244,212 @@ namespace TestUserTypeApi.Controllers
         /// <param name="tps"></param>
         /// <returns></returns>
         [HttpGet("addfxqytabs")]
-        public async Task<IActionResult> AddFxqytabs(string ids)
+        public async Task<IActionResult> AddFxqytabs(string ids, string nowdatetime)
         {
-            ///根据住院号获取住院患者信息
-            List<IConditionalModel> conModels = new List<IConditionalModel>();
-            conModels.Add(new ConditionalModel() { FieldName = "zy_no", ConditionalType = ConditionalType.In, FieldValue = ids });
-            var list = _Iv_csm_zhuyuanRepository.GetListALL(conModels, "zy_no desc");
-            if (list.Result != null)
+            if (nowdatetime != null)
             {
-                foreach (var item in list.Result)
-                {
-                    //发送成功一条就添加一条记录var a = _IHzsfMassagesRepository.AddRetID(tp);
-                    //发送手机号
-                    var sendtel = item.PAT_PHONE;
-                    //发送内容
-                    var sendcenter = _configuration["sendcent:centers"].ToString();
-                    string resultstrs = sendcyinfo(sendtel, sendcenter);
-                    if (Convert.ToInt32(resultstrs) > 0)
-                    {
-                        //定义发送记录实例
-                        #region 添加发送记录信息
-                        HzsfMassages tp = new HzsfMassages();
-                        tp.sendcenters = sendcenter;// 发送内容
-                        tp.replaycenters = "";// 回复内容
-                        tp.sendmyeds = ""; // 满意度
-                        tp.senddate = DateTime.Now;// 发送时间
-                        tp.ZY_NO = item.ZY_NO;  // --住院号
-                        tp.NAME = item.NAME;  // --病人姓名
-                        tp.SEX = item.SEX;    // --病人性别
-                        tp.ZY_AGE = item.ZY_AGE;    // --住院年龄
-                        tp.PAT_PHONE = item.PAT_PHONE;         // --本人联系电话
-                        tp.JB_NAME = item.JB_NAME;    // --疾病描述（名称）
-                        tp.CY_ZD = item.CY_ZD;       //   --出院诊断
-                        tp.IS_OP = item.IS_OP;  // --是否手术
-                        tp.DIA_NAME = item.DIA_NAME;        // --诊断方式
-                        tp.NURSE_IN_CHARGE = item.NURSE_IN_CHARGE;     // --责任护士
-                        tp.CY_DEPT_NAME = item.CY_DEPT_NAME;    // --出院科室名称
-                        tp.RY_DATE = item.RY_DATE; // --入院日期
-                        tp.CY_DATE = item.CY_DATE;  // --出院日期
-                        tp.ZY_TIMES = item.ZY_TIMES; // --住院次数
-                        tp.DIRECTOR = item.DIRECTOR;    // 科主任
-                        tp.ZZ_DOC = item.ZZ_DOC;    // 主治医师
-                        tp.JZ_DOC = item.JZ_DOC; // 经治医师
-                        tp.ZY_DAYS = item.ZY_DAYS;    // 住院天数
-                        tp.ZY_DEPT_NAME = item.ZY_DEPT_NAME;  // 住院科室名称
-                        tp.JOB = item.JOB;           // 职业
-                        tp.OUT_OR_IN = item.OUT_OR_IN;   // 住院或出院
-                        tp.statesissuccess = "成功";
-                        tp.isdelete = 0;  //是否删除
-                        var a = _IHzsfMassagesRepository.AddRetID(tp);
-                        #endregion
-
-                    }
-                    else if (Convert.ToInt32(resultstrs) == -5)
-                    {
-                        return Error("余额不足，请充值");
-                    }
-                    else if (Convert.ToInt32(resultstrs) == -6)
-                    {
-                        return Error("定时发送时间不是有效的时间格式");
-                    }
-                    else if (Convert.ToInt32(resultstrs) == -7)
-                    {
-                        return Error("提交信息末尾未签名，请添加中文的企业签名【 】");
-                    }
-                    else if (Convert.ToInt32(resultstrs) == -8)
-                    {
-                        return Error("发送内容需在1到300字之间");
-                    }
-                    else if (Convert.ToInt32(resultstrs) == -9)
-                    {
-                        return Error("发送号码为空");
-                    }
-                    else if (Convert.ToInt32(resultstrs) == -10)
-                    {
-                        return Error("定时时间不能小于系统当前时间");
-                    }
-                    else if (Convert.ToInt32(resultstrs) == -100)
-                    {
-                        return Error("IP黑名单");
-                    }
-                    else if (Convert.ToInt32(resultstrs) == -102)
-                    {
-                        return Error("账号黑名单");
-                    }
-                    else if (Convert.ToInt32(resultstrs) == -103)
-                    {
-                        return Error("IP未导白");
-                    }
-                    else
-                    {
-                        return Error("调用接口失败");
-                    }
-                    
-                }
-               
+                nowdatetime = Convert.ToDateTime(nowdatetime).AddDays(-3).ToString("yyyy-MM-dd");
             }
             else
             {
-                return Error("没有转患者数据");
+                nowdatetime = DateTime.Now.AddDays(-3).ToString("yyyy-MM-dd");
             }
+            string[] arrStr = ids.Split(',');
+            foreach (var item in arrStr)
+            {
+                var massageinfo = await _IHzsfMassagesRepository.GetSingle(p => p.CY_DATE == nowdatetime && p.PAT_PHONE == item);
+                if (massageinfo != null)
+                {
+                    continue;
+                }
+                var modelinfo =await _Iv_csm_zhuyuanRepository.GetSingle(p=>p.CY_DATE==nowdatetime&&p.PAT_PHONE==item);
+                //发送成功一条就添加一条记录var a = _IHzsfMassagesRepository.AddRetID(tp);
+                //发送手机号
+                var sendtel = item;
+                //发送内容
+                var sendcenter = _configuration["sendcent:centers"].ToString();
+                string resultstrs = sendcyinfo(sendtel, sendcenter);
+                if (Convert.ToInt32(resultstrs) > 0)
+                {
+                    //定义发送记录实例
+                    #region 添加发送记录信息
+                    HzsfMassages tp = new HzsfMassages();
+                    tp.sendcenters = sendcenter;// 发送内容
+                    tp.replaycenters = "";// 回复内容
+                    tp.nomybecause = "";//不满意原因
+                    tp.sendmyeds = ""; // 满意度
+                    tp.senddate = DateTime.Now;// 发送时间
+                    tp.ZY_NO = modelinfo.ZY_NO;  // --住院号
+                    tp.NAME = modelinfo.NAME;  // --病人姓名
+                    tp.SEX = modelinfo.SEX;    // --病人性别
+                    tp.ZY_AGE = modelinfo.ZY_AGE;    // --住院年龄
+                    tp.PAT_PHONE = modelinfo.PAT_PHONE;         // --本人联系电话
+                    tp.JB_NAME = modelinfo.JB_NAME;    // --疾病描述（名称）
+                    tp.CY_ZD = modelinfo.CY_ZD;       //   --出院诊断
+                    tp.IS_OP = modelinfo.IS_OP;  // --是否手术
+                    tp.DIA_NAME = modelinfo.DIA_NAME;        // --诊断方式
+                    tp.NURSE_IN_CHARGE = modelinfo.NURSE_IN_CHARGE;     // --责任护士
+                    tp.CY_DEPT_NAME = modelinfo.CY_DEPT_NAME;    // --出院科室名称
+                    tp.RY_DATE = modelinfo.RY_DATE; // --入院日期
+                    tp.CY_DATE = modelinfo.CY_DATE;  // --出院日期
+                    tp.ZY_TIMES = modelinfo.ZY_TIMES; // --住院次数
+                    tp.DIRECTOR = modelinfo.DIRECTOR;    // 科主任
+                    tp.ZZ_DOC = modelinfo.ZZ_DOC;    // 主治医师
+                    tp.JZ_DOC = modelinfo.JZ_DOC; // 经治医师
+                    tp.ZY_DAYS = modelinfo.ZY_DAYS;    // 住院天数
+                    tp.ZY_DEPT_NAME = modelinfo.ZY_DEPT_NAME;  // 住院科室名称
+                    tp.JOB = modelinfo.JOB;           // 职业
+                    tp.OUT_OR_IN = modelinfo.OUT_OR_IN;   // 住院或出院
+                    tp.statesissuccess = "成功";
+                    tp.isdelete = 0;  //是否删除
+                    var a = _IHzsfMassagesRepository.AddRetID(tp);
+                    #endregion
+
+                }
+                else if (Convert.ToInt32(resultstrs) == -5)
+                {
+                    return Error("余额不足，请充值");
+                }
+                else if (Convert.ToInt32(resultstrs) == -6)
+                {
+                    return Error("定时发送时间不是有效的时间格式");
+                }
+                else if (Convert.ToInt32(resultstrs) == -7)
+                {
+                    return Error("提交信息末尾未签名，请添加中文的企业签名【 】");
+                }
+                else if (Convert.ToInt32(resultstrs) == -8)
+                {
+                    return Error("发送内容需在1到300字之间");
+                }
+                else if (Convert.ToInt32(resultstrs) == -9)
+                {
+                    return Error("发送号码为空");
+                }
+                else if (Convert.ToInt32(resultstrs) == -10)
+                {
+                    return Error("定时时间不能小于系统当前时间");
+                }
+                else if (Convert.ToInt32(resultstrs) == -100)
+                {
+                    return Error("IP黑名单");
+                }
+                else if (Convert.ToInt32(resultstrs) == -102)
+                {
+                    return Error("账号黑名单");
+                }
+                else if (Convert.ToInt32(resultstrs) == -103)
+                {
+                    return Error("IP未导白");
+                }
+                else
+                {
+                    return Error("调用接口失败");
+                }
+            }
+
+            #region 不用的备份
+            /////根据住院号获取住院患者信息
+            //List<IConditionalModel> conModels = new List<IConditionalModel>();
+
+            //conModels.Add(new ConditionalModel() { FieldName = "CY_DATE", ConditionalType = ConditionalType.Equal, FieldValue = nowdatetime });
+            //conModels.Add(new ConditionalModel() { FieldName = "zy_no", ConditionalType = ConditionalType.In, FieldValue = ids });
+            //var list = _Iv_csm_zhuyuanRepository.GetListALL(conModels, "zy_no desc");
+            //if (list.Result != null)
+            //{
+            //    foreach (var item in list.Result)
+            //    {
+            //        //发送成功一条就添加一条记录var a = _IHzsfMassagesRepository.AddRetID(tp);
+            //        //发送手机号
+            //        var sendtel = item.PAT_PHONE;
+            //        //发送内容
+            //        var sendcenter = _configuration["sendcent:centers"].ToString();
+            //        string resultstrs = sendcyinfo(sendtel, sendcenter);
+            //        if (Convert.ToInt32(resultstrs) > 0)
+            //        {
+            //            //定义发送记录实例
+            //            #region 添加发送记录信息
+            //            HzsfMassages tp = new HzsfMassages();
+            //            tp.sendcenters = sendcenter;// 发送内容
+            //            tp.replaycenters = "";// 回复内容
+            //            tp.sendmyeds = ""; // 满意度
+            //            tp.senddate = DateTime.Now;// 发送时间
+            //            tp.ZY_NO = item.ZY_NO;  // --住院号
+            //            tp.NAME = item.NAME;  // --病人姓名
+            //            tp.SEX = item.SEX;    // --病人性别
+            //            tp.ZY_AGE = item.ZY_AGE;    // --住院年龄
+            //            tp.PAT_PHONE = item.PAT_PHONE;         // --本人联系电话
+            //            tp.JB_NAME = item.JB_NAME;    // --疾病描述（名称）
+            //            tp.CY_ZD = item.CY_ZD;       //   --出院诊断
+            //            tp.IS_OP = item.IS_OP;  // --是否手术
+            //            tp.DIA_NAME = item.DIA_NAME;        // --诊断方式
+            //            tp.NURSE_IN_CHARGE = item.NURSE_IN_CHARGE;     // --责任护士
+            //            tp.CY_DEPT_NAME = item.CY_DEPT_NAME;    // --出院科室名称
+            //            tp.RY_DATE = item.RY_DATE; // --入院日期
+            //            tp.CY_DATE = item.CY_DATE;  // --出院日期
+            //            tp.ZY_TIMES = item.ZY_TIMES; // --住院次数
+            //            tp.DIRECTOR = item.DIRECTOR;    // 科主任
+            //            tp.ZZ_DOC = item.ZZ_DOC;    // 主治医师
+            //            tp.JZ_DOC = item.JZ_DOC; // 经治医师
+            //            tp.ZY_DAYS = item.ZY_DAYS;    // 住院天数
+            //            tp.ZY_DEPT_NAME = item.ZY_DEPT_NAME;  // 住院科室名称
+            //            tp.JOB = item.JOB;           // 职业
+            //            tp.OUT_OR_IN = item.OUT_OR_IN;   // 住院或出院
+            //            tp.statesissuccess = "成功";
+            //            tp.isdelete = 0;  //是否删除
+            //            var a = _IHzsfMassagesRepository.AddRetID(tp);
+            //            #endregion
+
+            //        }
+            //        else if (Convert.ToInt32(resultstrs) == -5)
+            //        {
+            //            return Error("余额不足，请充值");
+            //        }
+            //        else if (Convert.ToInt32(resultstrs) == -6)
+            //        {
+            //            return Error("定时发送时间不是有效的时间格式");
+            //        }
+            //        else if (Convert.ToInt32(resultstrs) == -7)
+            //        {
+            //            return Error("提交信息末尾未签名，请添加中文的企业签名【 】");
+            //        }
+            //        else if (Convert.ToInt32(resultstrs) == -8)
+            //        {
+            //            return Error("发送内容需在1到300字之间");
+            //        }
+            //        else if (Convert.ToInt32(resultstrs) == -9)
+            //        {
+            //            return Error("发送号码为空");
+            //        }
+            //        else if (Convert.ToInt32(resultstrs) == -10)
+            //        {
+            //            return Error("定时时间不能小于系统当前时间");
+            //        }
+            //        else if (Convert.ToInt32(resultstrs) == -100)
+            //        {
+            //            return Error("IP黑名单");
+            //        }
+            //        else if (Convert.ToInt32(resultstrs) == -102)
+            //        {
+            //            return Error("账号黑名单");
+            //        }
+            //        else if (Convert.ToInt32(resultstrs) == -103)
+            //        {
+            //            return Error("IP未导白");
+            //        }
+            //        else
+            //        {
+            //            return Error("调用接口失败");
+            //        }
+
+            //    }
+
+            //}
+            //else
+            //{
+            //    return Error("没有转患者数据");
+            //} 
+            #endregion
             return Success("成功");
 
         }

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi/Controllers/TestUserTypeController.cs

@@ -2164,16 +2164,16 @@ namespace TestUserTypeApi.Controllers
         #endregion
         #region 双向转诊模块
         [HttpGet("gethzinflists")]
-        public async Task<IActionResult> Gethzinflists(string id)
+        public async Task<IActionResult> Gethzinflists(string id,string name )
         {
             if (id != null)
             {
-                var model = await _IWjzqjsRepository.Get(p => p.id == id);
+                var model = await _IHzjbxxRepository.Get(p => p.id == id&& p.isdelete == 0);
                 return Success("成功", model);
             }
             else
             {
-                var model = await _IWjzqjsRepository.Get(p => p.isdelete == 0);
+                var model = await _IHzjbxxRepository.Get(p => p.isdelete == 0&&p.Hzname.Contains(name));
                 return Success("成功", model);
             }
         }
@@ -2245,7 +2245,7 @@ namespace TestUserTypeApi.Controllers
         [HttpGet("upszzy")]
         public async Task<IActionResult> upSzzy(Model.Dto.Szzys tps)
         {
-            Szzys tp = new Szzys();
+            Szzys tp =await _ISzzysRepository.GetSingle(p=>p.id==tps.id);
             tp.id = tps.id;
             //tp.Szzydjsj = tps.Szzydjsj;//登记时间
             tp.Szzyzzdw = tps.Szzyzzdw;//转诊单位
@@ -2266,7 +2266,7 @@ namespace TestUserTypeApi.Controllers
             tp.Syzzzrrs = tps.Syzzzrrs;//责任人
             tp.Syzzzrrss = tps.Syzzzrrss;//责任人
             tp.isdelete = 0;
-            var resua = _ISzzysRepository.Update(tp);
+            var resua = _ISzzysRepository.UpdateOne(tp);
             if (resua.Result)
             {
                 var szzysmode = await _ISzzysRepository.GetSingle(p=>p.id==tps.id);
@@ -2342,16 +2342,23 @@ namespace TestUserTypeApi.Controllers
             listApp.Add(Builders<Szzys>.Filter.Eq("isdelete", 0));
             if (!string.IsNullOrWhiteSpace(stardate))
             {
-                listApp.Add(Builders<Szzys>.Filter.Gt("Szzydjsj", DateTime.Parse(stardate.Trim() + " 00:00:00")));
+                //listApp.Add(Builders<Szzys>.Filter.Gt("Syzysj", DateTime.Parse(stardate.Trim() + " 00:00:00")));
+                listApp.Add(Builders<Szzys>.Filter.Where(p=>p.Syzysj >= DateTime.Parse(stardate.Trim() + " 00:00:00")));
             }
             if (!string.IsNullOrWhiteSpace(endtime))
             {
-                listApp.Add(Builders<Szzys>.Filter.Lt("Szzydjsj", DateTime.Parse(endtime.Trim() + " 23:59:59")));
+                //listApp.Add(Builders<Szzys>.Filter.Lt("Syzysj", DateTime.Parse(endtime.Trim() + " 23:59:59")));
+                listApp.Add(Builders<Szzys>.Filter.Where(p=>p.Syzysj<= DateTime.Parse(endtime.Trim() + " 23:59:59")));
             }
             if (zzdwname != null)
             {
+                var normallistAppor = new List<FilterDefinition<Szzys>>();
+                
+                normallistAppor.Add(Builders<Szzys>.Filter.Where(p => p.Szzyzzdw.Contains(zzdwname)));
+                normallistAppor.Add(Builders<Szzys>.Filter.Where(p => p.Hzzyh.Contains(zzdwname)));
+                normallistAppor.Add(Builders<Szzys>.Filter.Where(p => p.Hzname.Contains(zzdwname)));
+                listApp.Add(Builders<Szzys>.Filter.Or(normallistAppor));
                 //listApp.Add(Builders<Szzys>.Filter.Eq("Szzyzzdw", zzdwname));
-                listApp.Add(Builders<Szzys>.Filter.Where(p=>p.Szzyzzdw.Contains(zzdwname)));
             }
             var filter = Builders<Szzys>.Filter.And(listApp);
 
@@ -2404,7 +2411,95 @@ namespace TestUserTypeApi.Controllers
             };
             return Success("成功", obj);
         }
+        /// <summary>
+        /// 导出上转住院信息
+        /// </summary>
+        /// <param name="stardate"></param>
+        /// <param name="endtime"></param>
+        /// <param name="zzdwname"></param>
+        /// <returns></returns>
+        [HttpGet("exportexcelszzy")]
+        [AllowAnonymous]
+        public async Task<IActionResult> ExportExcelAsyncwcode(string stardate, string endtime, string zzdwname)
+        {
+            
+            try
+            {
+                //排序字段
+                var sort = Builders<Szzys>.Sort.Descending("Szzydjsj");
+                //根据条件查询集合
+                var listApp = new List<FilterDefinition<Szzys>>();
+                listApp.Add(Builders<Szzys>.Filter.Eq("isdelete", 0));
+                if (!string.IsNullOrWhiteSpace(stardate))
+                {
+                    listApp.Add(Builders<Szzys>.Filter.Gt("Syzysj", DateTime.Parse(stardate.Trim() + " 00:00:00")));
+                }
+                if (!string.IsNullOrWhiteSpace(endtime))
+                {
+                    listApp.Add(Builders<Szzys>.Filter.Lt("Syzysj", DateTime.Parse(endtime.Trim() + " 23:59:59")));
+                }
+                if (zzdwname != null)
+                {
+                    var normallistAppor = new List<FilterDefinition<Szzys>>();
 
+                    normallistAppor.Add(Builders<Szzys>.Filter.Where(p => p.Szzyzzdw.Contains(zzdwname)));
+                    normallistAppor.Add(Builders<Szzys>.Filter.Where(p => p.Hzzyh.Contains(zzdwname)));
+                    normallistAppor.Add(Builders<Szzys>.Filter.Where(p => p.Hzname.Contains(zzdwname)));
+                    listApp.Add(Builders<Szzys>.Filter.Or(normallistAppor));
+                    //listApp.Add(Builders<Szzys>.Filter.Eq("Szzyzzdw", zzdwname));
+                }
+                var filter = Builders<Szzys>.Filter.And(listApp);
+
+                var lists = await _ISzzysRepository.Get(filter);
+
+                List<Model.Dto.exportexcelszzy> list = new List<Model.Dto.exportexcelszzy>();
+                foreach (var item in lists)
+                {
+                    Model.Dto.exportexcelszzy model = new Model.Dto.exportexcelszzy();
+                    model.Szzydjsj = item.Szzydjsj!=null ? item.Szzydjsj : null;//DateTime.ParseExact("2013-11-17T11:59:22+08:00","yyyy-MM-ddTHH:mm:ss+08:00",null)
+                    model.Szzyzzdw =item.Szzyzzdw != null ? item.Szzyzzdw.ToString() : "";
+                    model.Szzyzzys =item.Szzyzzys != null ? item.Szzyzzys.ToString() : "";
+                    model.Yslxfs   =item.Yslxfs != null ? item.Yslxfs.ToString() : "";
+                    model.Hzname   =item.Hzname != null ? item.Hzname.ToString() : "";
+                    model.HzGender =item.HzGender != null ? item.HzGender.ToString() : "";
+                    model.Hzage    =item.Hzage != null ? item.Hzage.ToString() : "";
+                    model.Hzzd     =item.Hzzd != null ? item.Hzzd.ToString() : "";
+                    model.Hzzyks   =item.Hzzyks != null ? item.Hzzyks.ToString() : "";
+                    model.Hzzyh    =item.Hzzyh != null ? item.Hzzyh.ToString() : "";
+                    model.Hzlxfs   =item.Hzlxfs != null ? item.Hzlxfs.ToString() : "";
+                    model.Syzzzzmd =item.Syzzzzmd != null ? item.Syzzzzmd.ToString() : "";
+                    model.Syzysj   =item.Syzysj != null ? item.Syzysj : null;
+                    model.Syzyfy   =item.Syzyfy != null ? item.Syzyfy.ToString() : "";
+                    model.Syzzzrr  =item.Syzzzrr != null ? item.Syzzzrr.ToString() : "";
+                    model.Syzzzzfw =item.Syzzzzfw != null ? item.Syzzzzfw.ToString() : "";
+                    model.Syzzzrrs = item.Syzzzrrs != null ? item.Syzzzrrs.ToString() : "";
+                    list.Add(model);
+                }
+                NPOIHelper npoi = new NPOIHelper();
+                var tb = ModelConvertHelper<Szzys>.ListToTable(list,null);
+                if (tb != null)
+                {
+                    //导出dtnew 
+                    string[] cols = { "登记时间","转诊单位","转诊医师","联系方式","患者姓名","患者性别","患者年龄","患者诊断","住院科室","住院号","联系方式","转诊目的","住院时间","住院费用","责任人","诊中服务","责任人" };
+
+                    byte[] sm = npoi.ExportToExcel1(tb, cols);
+                    if (sm != null)
+                    {
+                        return File(sm, "application/vnd.ms-excel", "上转住院.xlsx");
+                    }
+                    else
+                    {
+                        return Error("导出失败");
+                    }
+                }
+                return Error("没有数据");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "导出异常");
+                return Error("导出失败");
+            }
+        }
 
         #endregion
         #region 上转门诊
@@ -2472,7 +2567,7 @@ namespace TestUserTypeApi.Controllers
         [HttpGet("upszmzs")]
         public async Task<IActionResult> upSzmzs(Model.Dto.Szmzs tps)
         {
-            Szmzs tp = new Szmzs();
+            Szmzs tp =await _ISzmzsRepository.GetSingle(p=>p.id==tps.id);
             tp.id = tps.id;
             //tp.Szzydjsj = tps.Szzydjsj;//登记时间
             tp.Szzyzzdw = tps.Szzyzzdw;//转诊单位
@@ -2496,7 +2591,7 @@ namespace TestUserTypeApi.Controllers
             var resua = _ISzmzsRepository.Update(tp);
             if (resua.Result)
             {
-                var szzysmode = await _ISzzysRepository.GetSingle(p => p.id == tps.id);
+                var szzysmode = await _ISzmzsRepository.GetSingle(p => p.id == tps.id);
                 var hzinfomodel = await _IHzjbxxRepository.GetSingle(p => p.Hzname == szzysmode.Hzname && p.HzGender == szzysmode.HzGender && p.Hzage == szzysmode.Hzage && p.Hzzd == szzysmode.Hzzd && p.Hzlxfs == szzysmode.Hzlxfs);
                 if (hzinfomodel != null)
                 {
@@ -2565,17 +2660,22 @@ namespace TestUserTypeApi.Controllers
             //根据条件查询集合
             var listApp = new List<FilterDefinition<Szmzs>>();
             listApp.Add(Builders<Szmzs>.Filter.Eq("isdelete", 0));
+           
             if (!string.IsNullOrWhiteSpace(stardate))
             {
-                listApp.Add(Builders<Szmzs>.Filter.Gt("Szzydjsj", DateTime.Parse(stardate.Trim() + " 00:00:00")));
+                listApp.Add(Builders<Szmzs>.Filter.Where(p => p.Szzydjsj >= DateTime.Parse(stardate.Trim() + " 00:00:00")));
             }
             if (!string.IsNullOrWhiteSpace(endtime))
             {
-                listApp.Add(Builders<Szmzs>.Filter.Lt("Szzydjsj", DateTime.Parse(endtime.Trim() + " 23:59:59")));
+                listApp.Add(Builders<Szmzs>.Filter.Where(p => p.Szzydjsj <= DateTime.Parse(endtime.Trim() + " 23:59:59")));
             }
             if (zzdwname != null)
             {
-                listApp.Add(Builders<Szmzs>.Filter.Eq("Szzyzzdw", zzdwname));
+                var normallistAppor = new List<FilterDefinition<Szmzs>>();
+
+                normallistAppor.Add(Builders<Szmzs>.Filter.Where(p => p.Szzyzzdw.Contains(zzdwname)));
+                normallistAppor.Add(Builders<Szmzs>.Filter.Where(p => p.Hzname.Contains(zzdwname)));
+                listApp.Add(Builders<Szmzs>.Filter.Or(normallistAppor));
             }
             var filter = Builders<Szmzs>.Filter.And(listApp);
 
@@ -2586,7 +2686,7 @@ namespace TestUserTypeApi.Controllers
             {
                 var countlis = 0;
                 //根据患者名称查找条数
-                var listcounts = _ISzzysRepository.Get(p => p.Hzname == item.Hzname);
+                var listcounts = _ISzmzsRepository.Get(p => p.Hzname == item.Hzname);
                 if (listcounts != null)
                 {
                     if (listcounts.Result.Count() > 1)
@@ -2689,7 +2789,7 @@ namespace TestUserTypeApi.Controllers
         [HttpGet("upszjcs")]
         public async Task<IActionResult> upSzjcs(Model.Dto.Szjcs tps)
         {
-            Szjcs tp = new Szjcs();
+            Szjcs tp = await _ISzjcsRepository.GetSingle(p => p.id == tps.id);
             tp.id = tps.id;
             //tp.Szzydjsj = tps.Szzydjsj;//登记时间
             tp.Szzyzzdw = tps.Szzyzzdw;//转诊单位
@@ -2706,8 +2806,8 @@ namespace TestUserTypeApi.Controllers
             var resua = _ISzjcsRepository.Update(tp);
             if (resua.Result)
             {
-                var szzysmode = await _ISzzysRepository.GetSingle(p => p.id == tps.id);
-                var hzinfomodel = await _IHzjbxxRepository.GetSingle(p => p.Hzname == szzysmode.Hzname && p.HzGender == szzysmode.HzGender && p.Hzage == szzysmode.Hzage && p.Hzzd == szzysmode.Hzzd && p.Hzlxfs == szzysmode.Hzlxfs);
+                var szzysmode = await _ISzjcsRepository.GetSingle(p => p.id == tps.id);
+                var hzinfomodel = await _IHzjbxxRepository.GetSingle(p => p.Hzname == szzysmode.Hzname && p.HzGender == szzysmode.HzGender && p.Hzage == szzysmode.Hzage && p.Hzzd == "" && p.Hzlxfs == szzysmode.Hzlxfs);
                 if (hzinfomodel != null)
                 {
                     //患者信息
@@ -2777,15 +2877,19 @@ namespace TestUserTypeApi.Controllers
             listApp.Add(Builders<Szjcs>.Filter.Eq("isdelete", 0));
             if (!string.IsNullOrWhiteSpace(stardate))
             {
-                listApp.Add(Builders<Szjcs>.Filter.Gt("Szzydjsj", DateTime.Parse(stardate.Trim() + " 00:00:00")));
+                listApp.Add(Builders<Szjcs>.Filter.Where(p => p.Szzydjsj >= DateTime.Parse(stardate.Trim() + " 00:00:00")));
             }
             if (!string.IsNullOrWhiteSpace(endtime))
             {
-                listApp.Add(Builders<Szjcs>.Filter.Lt("Szzydjsj", DateTime.Parse(endtime.Trim() + " 23:59:59")));
+                listApp.Add(Builders<Szjcs>.Filter.Where(p => p.Szzydjsj <= DateTime.Parse(endtime.Trim() + " 23:59:59")));
             }
             if (zzdwname != null)
             {
-                listApp.Add(Builders<Szjcs>.Filter.Eq("Szzyzzdw", zzdwname));
+                var normallistAppor = new List<FilterDefinition<Szjcs>>();
+
+                normallistAppor.Add(Builders<Szjcs>.Filter.Where(p => p.Szzyzzdw.Contains(zzdwname)));
+                normallistAppor.Add(Builders<Szjcs>.Filter.Where(p => p.Hzname.Contains(zzdwname)));
+                listApp.Add(Builders<Szjcs>.Filter.Or(normallistAppor));
             }
             var filter = Builders<Szjcs>.Filter.And(listApp);
 
@@ -2796,7 +2900,7 @@ namespace TestUserTypeApi.Controllers
             {
                 var countlis = 0;
                 //根据患者名称查找条数
-                var listcounts = _ISzzysRepository.Get(p => p.Hzname == item.Hzname);
+                var listcounts = _ISzjcsRepository.Get(p => p.Hzname == item.Hzname);
                 if (listcounts != null)
                 {
                     if (listcounts.Result.Count() > 1)
@@ -2889,7 +2993,7 @@ namespace TestUserTypeApi.Controllers
         [HttpGet("upxzzls")]
         public async Task<IActionResult> upXzzls(Model.Dto.Xzzls tps)
         {
-            Xzzls tp = new Xzzls();
+            Xzzls tp = await _IXzzlsRepository.GetSingle(p=>p.id==tps.id);
             tp.id = tps.id;
             //tp.Szzydjsj = tps.Szzydjsj;//登记时间
             tp.Szzyzzdw = tps.Szzyzzdw;//转诊单位
@@ -2987,7 +3091,11 @@ namespace TestUserTypeApi.Controllers
             }
             if (zzdwname != null)
             {
-                listApp.Add(Builders<Xzzls>.Filter.Eq("Szzyzzdw", zzdwname));
+                var normallistAppor = new List<FilterDefinition<Xzzls>>();
+
+                normallistAppor.Add(Builders<Xzzls>.Filter.Where(p => p.Szzyzzdw.Contains(zzdwname)));
+                normallistAppor.Add(Builders<Xzzls>.Filter.Where(p => p.Hzname.Contains(zzdwname)));
+                listApp.Add(Builders<Xzzls>.Filter.Or(normallistAppor));
             }
             var filter = Builders<Xzzls>.Filter.And(listApp);
 
@@ -2998,7 +3106,7 @@ namespace TestUserTypeApi.Controllers
             {
                 var countlis = 0;
                 //根据患者名称查找条数
-                var listcounts = _ISzzysRepository.Get(p => p.Hzname == item.Hzname);
+                var listcounts = _IXzzlsRepository.Get(p => p.Hzname == item.Hzname);
                 if (listcounts != null)
                 {
                     if (listcounts.Result.Count() > 1)
@@ -3099,7 +3207,7 @@ namespace TestUserTypeApi.Controllers
         [HttpGet("upxzzys")]
         public async Task<IActionResult> upXzzys(Model.Dto.Xzzys tps)
         {
-            Xzzys tp = new Xzzys();
+            Xzzys tp = await _IXzzysRepository.GetSingle(p=>p.id==tps.id);
             tp.id = tps.id;
             //tp.Szzydjsj = tps.Szzydjsj;//登记时间
             tp.Szzyzzdw = tps.Szzyzzdw;//转诊单位
@@ -3203,7 +3311,11 @@ namespace TestUserTypeApi.Controllers
             }
             if (zzdwname != null)
             {
-                listApp.Add(Builders<Xzzys>.Filter.Eq("Szzyzzdw", zzdwname));
+                var normallistAppor = new List<FilterDefinition<Xzzys>>();
+
+                normallistAppor.Add(Builders<Xzzys>.Filter.Where(p => p.Szzyzzdw.Contains(zzdwname)));
+                normallistAppor.Add(Builders<Xzzys>.Filter.Where(p => p.Hzname.Contains(zzdwname)));
+                listApp.Add(Builders<Xzzys>.Filter.Or(normallistAppor));
             }
             var filter = Builders<Xzzys>.Filter.And(listApp);
 
@@ -3320,7 +3432,7 @@ namespace TestUserTypeApi.Controllers
         [HttpGet("upwjzqjs")]
         public async Task<IActionResult> upWjzqjs(Model.Dto.Wjzqjs tps)
         {
-            Wjzqjs tp = new Wjzqjs();
+            Wjzqjs tp = await _IWjzqjsRepository.GetSingle(p=>p.id==tps.id);
             tp.id = tps.id;
             //tp.Szzydjsj = tps.Szzydjsj;//登记时间
             tp.Szzyzzdw = tps.Szzyzzdw;//转诊单位
@@ -3423,7 +3535,12 @@ namespace TestUserTypeApi.Controllers
             }
             if (zzdwname != null)
             {
-                listApp.Add(Builders<Wjzqjs>.Filter.Eq("Szzyzzdw", zzdwname));
+                var normallistAppor = new List<FilterDefinition<Wjzqjs>>();
+
+                normallistAppor.Add(Builders<Wjzqjs>.Filter.Where(p => p.Szzyzzdw.Contains(zzdwname)));
+                normallistAppor.Add(Builders<Wjzqjs>.Filter.Where(p => p.Hzzyh.Contains(zzdwname)));
+                normallistAppor.Add(Builders<Wjzqjs>.Filter.Where(p => p.Hzname.Contains(zzdwname)));
+                listApp.Add(Builders<Wjzqjs>.Filter.Or(normallistAppor));
             }
             var filter = Builders<Wjzqjs>.Filter.And(listApp);
 
@@ -3434,7 +3551,7 @@ namespace TestUserTypeApi.Controllers
             {
                 var countlis = 0;
                 //根据患者名称查找条数
-                var listcounts = _ISzzysRepository.Get(p => p.Hzname == item.Hzname);
+                var listcounts = _IWjzqjsRepository.Get(p => p.Hzname == item.Hzname);
                 if (listcounts != null)
                 {
                     if (listcounts.Result.Count() > 1)
@@ -3514,7 +3631,7 @@ namespace TestUserTypeApi.Controllers
         [HttpGet("upbbsqs")]
         public async Task<IActionResult> upBbsqs(Model.Dto.Bbsqs tps)
         {
-            Bbsqs tp = new Bbsqs();
+            Bbsqs tp = await _IBbsqsRepository.GetSingle(p => p.id == tps.id); ;
             tp.id = tps.id;
             //tp.Szzydjsj = tps.Szzydjsj;//登记时间
             tp.Szzyzzdw = tps.Szzyzzdw;//转诊单位
@@ -3591,7 +3708,11 @@ namespace TestUserTypeApi.Controllers
             }
             if (zzdwname != null)
             {
-                listApp.Add(Builders<Bbsqs>.Filter.Eq("Szzyzzdw", zzdwname));
+                var normallistAppor = new List<FilterDefinition<Bbsqs>>();
+
+                normallistAppor.Add(Builders<Bbsqs>.Filter.Where(p => p.Szzyzzdw.Contains(zzdwname)));
+                normallistAppor.Add(Builders<Bbsqs>.Filter.Where(p => p.Hzname.Contains(zzdwname)));
+                listApp.Add(Builders<Bbsqs>.Filter.Or(normallistAppor));
             }
             var filter = Builders<Bbsqs>.Filter.And(listApp);
 
@@ -3661,7 +3782,7 @@ namespace TestUserTypeApi.Controllers
         [HttpGet("uphzaps")]
         public async Task<IActionResult> upHzaps(Model.Dto.Hzaps tps)
         {
-            Hzaps tp = new Hzaps();
+            Hzaps tp =await _IHzapsRepository.GetSingle(p=>p.id==tps.id);
             tp.id = tps.id;
             tp.Hzsj = tps.Hzsj;//会诊时间
             tp.Sqhzjg = tps.Sqhzjg;//申请会诊机构
@@ -3934,7 +4055,7 @@ namespace TestUserTypeApi.Controllers
         [HttpGet("upyyzls")]
         public async Task<IActionResult> upYyzls(Model.Dto.Yyzls tps)
         {
-            Yyzls tp = new Yyzls();
+            Yyzls tp = await _IYyzlsRepository.GetSingle(p=>p.id==tps.id);
             tp.id = tps.id;
            // tp.Szzydjsj = tps.Szzydjsj;//登记日期
             tp.Szzyyydw = tps.Szzyyydw;//预约单位