1

代码/MadRunFabirc.Model/EquipmentApi.Model/DayTjlists.cs

@@ -18,7 +18,10 @@ namespace MadRunFabric.Model.EquipmentApi.Model
         /// 已完成数量
         /// </summary>
         public string finishcount { get; set; }
-       
+        /// <summary>
+        /// 总完结数
+        /// </summary>
+        public string wfinishcount { get; set; }
         /// <summary>
         /// 及时完成
         /// </summary>
@@ -44,18 +47,15 @@ namespace MadRunFabric.Model.EquipmentApi.Model
         /// 满意
         /// </summary>
         public string  mywocode { get; set; }
-        // <summary>
-        // 一般基本满意
-        // </summary>
-        public string ybwocode { get; set; }
+        //// <summary>
+        //// 一般基本满意
+        //// </summary>
+        //public string ybwocode { get; set; }
         /// <summary>
         /// 差
         /// </summary>
         public string  cwocode { get; set; }
-        ///// <summary>
-        ///// 总完结数
-        ///// </summary>
-        //public string wfinishcount { get; set; }
+       
 
         /// <summary>
         /// 满意度信息

代码/MadRunFabirc.Model/TestUserTypeApi/Xzzls.cs

@@ -62,7 +62,7 @@ namespace MadRunFabric.Model.TestUserTypeApi
         public DateTime? Xyjzsj { get; set; }
 
         /// <summary>
-        /// 责任人
+        /// 登记人
         /// </summary>
         public string Syzzzrr { get; set; }
         /// <summary>

代码/MadRunFabirc.Model/TestUserTypeApi/Yyzls.cs

@@ -34,6 +34,14 @@ namespace MadRunFabric.Model.TestUserTypeApi
         /// </summary>
         public string Hzname { get; set; }
         /// <summary>
+        /// 性别
+        /// </summary>
+        public string HzGender { get; set; }
+        /// <summary>
+        /// 年龄
+        /// </summary>
+        public string Hzage { get; set; }
+        /// <summary>
         /// 预约科室
         /// </summary>
         public string Hzyyks { get; set; }

代码/MadRunFabric.Common/Filters/ActionFilter.cs

@@ -3,14 +3,40 @@ using System.Collections.Generic;
 using System.Text;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Configuration;
 using NLog;
 
 namespace MadRunFabric.Common
 {
     public class ActionFilter: ActionFilterAttribute
     {
+        IConfiguration _configuration;
+        public ActionFilter(IConfiguration configuration )
+        {
+            _configuration = configuration; 
+        }
         public override void OnActionExecuting(ActionExecutingContext context)
         {
+            //try
+            //{
+            //    if (_configuration["IsLogin"] == "0")
+            //    {
+            //        context.Result = new ContentResult() { Content = new AjaxResult { state = ResultTypes.notoken.ToString(), message = "系统异常，请稍后重试" }.ToJson() };
+            //        return;
+            //    }
+            //}
+            //catch
+            //{
+
+            //}
+
+            //var dateauth = DateTime.Parse(_configuration["AuthDate"]);
+            //if ( DateTime.Now> dateauth) {
+            //    context.Result = new ContentResult() { Content = new AjaxResult { state = ResultTypes.notoken.ToString(), message = "授权已到期" }.ToJson() };
+            //    return;
+            //}
+
+            
             var request = context.HttpContext.Request;
 
             var log = LogManager.GetCurrentClassLogger();

代码/MadRunFabric.Common/NPOIHelper.cs

@@ -322,6 +322,7 @@ namespace MadRunFabric.Common
                 Stream stream = upfile.OpenReadStream();
 
                 string suffix = upfile.FileName.Substring(upfile.FileName.LastIndexOf(".") + 1).ToLower();
+
                 if (suffix == "xlsx") // 2007版本
                 {
                     workbook = new XSSFWorkbook(stream);

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

@@ -2863,14 +2863,14 @@ namespace EquipmentApi.Controllers.workordermanage
                             if (item.dealtime >= startime && item.dealtime <= endtime)
                             {
                                 wccount++;
-                                if (item.score == 4 || item.score == 5 )
+                                if (item.score == 3||item.score == 4 || item.score == 5 )
                                 {
                                     allmywocodecounts++;
                                 }
-                                if ( item.score == 3)
-                                {
-                                    alljbmywocodecounts++;
-                                }
+                                //if ( item.score == 3)
+                                //{
+                                //    alljbmywocodecounts++;
+                                //}
                                 if (item.score == 1 || item.score == 2)
                                 {
                                     allnomywocodecounts++;
@@ -2941,7 +2941,8 @@ namespace EquipmentApi.Controllers.workordermanage
                         }
                         else
                         {
-                            double percent = (Convert.ToDouble(allmywocodecount)+Convert.ToDouble(alljbmywocodecounts)*0.8) / Convert.ToDouble(wfinishcount);
+                            //double percent = (Convert.ToDouble(allmywocodecount)+Convert.ToDouble(alljbmywocodecounts)*0.8) / Convert.ToDouble(wfinishcount);
+                            double percent = Convert.ToDouble(allmywocodecount) / Convert.ToDouble(wfinishcount);
                             mydblcount = percent.ToString("0.00%");//满意度
                         }
                         #endregion
@@ -3077,14 +3078,14 @@ namespace EquipmentApi.Controllers.workordermanage
                             if (item.dealtime >= startime && item.dealtime <= endtime)
                             {
                                 wccount++;
-                                if (item.score == 4 || item.score == 5 )
+                                if (item.score == 3||item.score == 4 || item.score == 5 )
                                 {
                                     allmywocodecounts++;
                                 }
-                                if ( item.score == 3)
-                                {
-                                    alljbmywocodecounts++;
-                                }
+                                //if ( item.score == 3)
+                                //{
+                                //    alljbmywocodecounts++;
+                                //}
                                 if (item.score == 1 || item.score == 2)
                                 {
                                     allnomywocodecounts++;
@@ -3150,7 +3151,8 @@ namespace EquipmentApi.Controllers.workordermanage
                         }
                         else
                         {
-                            double percent = (Convert.ToDouble(allmywocodecount)+Convert.ToDouble(alljbmywocodecounts)*0.8) / Convert.ToDouble(wfinishcount);
+                            //double percent = (Convert.ToDouble(allmywocodecount)+Convert.ToDouble(alljbmywocodecounts)*0.8) / Convert.ToDouble(wfinishcount);
+                            double percent = Convert.ToDouble(allmywocodecount)  / Convert.ToDouble(wfinishcount);
                             mydblcount = percent.ToString("0.00%");//满意度
                         }
                         #endregion
@@ -3243,9 +3245,9 @@ namespace EquipmentApi.Controllers.workordermanage
                     daytjinfo.finishlv = finishlv;         //完成单率
                     daytjinfo.nofinnishlv = nofinnishlv;    //未完成率
                     daytjinfo.mywocode = mywocode;//满意
-                    daytjinfo.ybwocode = ybwocode;//一般
+                    //daytjinfo.ybwocode = ybwocode;//一般
                     daytjinfo.cwocode = cwocode;//差
-                    //daytjinfo.wfinishcount = wfinishcounts;//总完结数
+                    daytjinfo.wfinishcount = wfinishcounts;//总完结数
                     daytjinfo.mydinfo = mydblcount;//满意度
                     daytjinfo.comfrom = byformcount;//本院
                     daytjinfo.comfrombl = comfrombl;//本院率
@@ -3337,14 +3339,14 @@ namespace EquipmentApi.Controllers.workordermanage
                                 if (finitem.dealtime >= startime && finitem.dealtime <= endtime)
                                 {
                                     wccount++;
-                                    if (finitem.score == 4 || finitem.score == 5 )
+                                    if (finitem.score == 3||finitem.score == 4 || finitem.score == 5 )
                                     {
                                         allmywocodecounts++;
                                     }
-                                    if ( finitem.score == 3)
-                                    {
-                                        alljbmywocodecounts++;
-                                    }
+                                    //if ( finitem.score == 3)
+                                    //{
+                                    //    alljbmywocodecounts++;
+                                    //}
                                     if (finitem.score == 1 || finitem.score == 2)
                                     {
                                         allnomywocodecounts++;
@@ -3410,7 +3412,8 @@ namespace EquipmentApi.Controllers.workordermanage
                             }
                             else
                             {
-                                double percent = (Convert.ToDouble(allmywocodecount) + Convert.ToDouble(alljbmywocodecounts) * 0.8) / Convert.ToDouble(wfinishcount);
+                                //double percent = (Convert.ToDouble(allmywocodecount) + Convert.ToDouble(alljbmywocodecounts) * 0.8) / Convert.ToDouble(wfinishcount);
+                                double percent = Convert.ToDouble(allmywocodecount) / Convert.ToDouble(wfinishcount);
                                 mydblcount = percent.ToString("0.00%");//满意度
                             }
                             #endregion
@@ -3526,14 +3529,14 @@ namespace EquipmentApi.Controllers.workordermanage
                                 if (finiitem.dealtime >= startime && finiitem.dealtime <= endtime)
                                 {
                                     wccount++;
-                                    if (finiitem.score == 4 || finiitem.score == 5 )
+                                    if (finiitem.score == 3||finiitem.score == 4 || finiitem.score == 5 )
                                     {
                                         allmywocodecounts++;
                                     }
-                                    if ( finiitem.score == 3)
-                                    {
-                                        alljbmywocodecounts++;
-                                    }
+                                    //if ( finiitem.score == 3)
+                                    //{
+                                    //    alljbmywocodecounts++;
+                                    //}
                                     if (finiitem.score == 1 || finiitem.score == 2)
                                     {
                                         allnomywocodecounts++;
@@ -3598,7 +3601,8 @@ namespace EquipmentApi.Controllers.workordermanage
                             }
                             else
                             {
-                                double percent = (Convert.ToDouble(allmywocodecount) + Convert.ToDouble(alljbmywocodecounts) * 0.8) / Convert.ToDouble(wfinishcount);
+                                //double percent = (Convert.ToDouble(allmywocodecount) + Convert.ToDouble(alljbmywocodecounts) * 0.8) / Convert.ToDouble(wfinishcount);
+                                double percent = Convert.ToDouble(allmywocodecount) / Convert.ToDouble(wfinishcount);
                                 mydblcount = percent.ToString("0.00%");//满意度
                             }
                             #endregion
@@ -3697,9 +3701,9 @@ namespace EquipmentApi.Controllers.workordermanage
                         daytjinfo.finishlv = finishlv;         //完成单率
                         daytjinfo.nofinnishlv = nofinnishlv;    //未完成率
                         daytjinfo.mywocode = mywocode;//满意
-                        daytjinfo.ybwocode = ybwocode;//一般
+                        //daytjinfo.ybwocode = ybwocode;//一般
                         daytjinfo.cwocode = cwocode;//差
-                       // daytjinfo.wfinishcount = wfinishcounts;//完结量
+                        daytjinfo.wfinishcount = wfinishcounts;//完结量
                         daytjinfo.mydinfo = mydblcount;//满意度
                         daytjinfo.comfrom = byformcount;//本院
                         daytjinfo.comfrombl = comfrombl;//本院率   daytjinfo.comfromsbl = comfromsbl;//第三方率
@@ -3793,12 +3797,18 @@ namespace EquipmentApi.Controllers.workordermanage
                         //先获取所有满意的班组内的工单数量
                         //double percent = Convert.ToDouble(2) / Convert.ToDouble(34);
                         //string result = percent.ToString("0.000%");//得到5.882%
+                        //var allmywocodecount = _wo_repair_baseRepository.Count(p => p.createtime >= startime
+                        //                                             && p.createtime <= endtime
+                        //                                              && p.Jwocode == Jwocode
+                        //                                              && p.isdelete == 0
+                        //                                              && p.wostate == 3
+                        //                                              && (p.score == 4 || p.score == 5)).Result.ToString();
                         var allmywocodecount = _wo_repair_baseRepository.Count(p => p.createtime >= startime
-                                                                     && p.createtime <= endtime
-                                                                      && p.Jwocode == Jwocode
-                                                                      && p.isdelete == 0
-                                                                      && p.wostate == 3
-                                                                      && (p.score == 4 || p.score == 5)).Result.ToString();
+                                                                    && p.createtime <= endtime
+                                                                     && p.Jwocode == Jwocode
+                                                                     && p.isdelete == 0
+                                                                     && p.wostate == 3
+                                                                     && (p.score == 3||p.score == 4 || p.score == 5)).Result.ToString();
                         var alljbmywocodecount = _wo_repair_baseRepository.Count(p => p.createtime >= startime
                                                                     && p.createtime <= endtime
                                                                      && p.Jwocode == Jwocode
@@ -3815,7 +3825,8 @@ namespace EquipmentApi.Controllers.workordermanage
                         }
                         else
                         {
-                            double percent = (Convert.ToDouble(allmywocodecount) + Convert.ToDouble(alljbmywocodecount) * 0.8) / Convert.ToDouble(wfinishcount);
+                            //double percent = (Convert.ToDouble(allmywocodecount) + Convert.ToDouble(alljbmywocodecount) * 0.8) / Convert.ToDouble(wfinishcount);
+                            double percent = Convert.ToDouble(allmywocodecount)  / Convert.ToDouble(wfinishcount);
                             mydblcount = percent.ToString("0.00%");//满意度
                         }
                        
@@ -3949,10 +3960,14 @@ namespace EquipmentApi.Controllers.workordermanage
                         //先获取所有满意的班组内的工单数量
                         //double percent = Convert.ToDouble(2) / Convert.ToDouble(34);
                         //string result = percent.ToString("0.000%");//得到5.882%
+                        //var allmywocodecount = _wo_repair_baseRepository.Count(p => p.Jwocode == Jwocode
+                        //                                              && p.isdelete == 0
+                        //                                              && p.wostate == 3
+                        //                                              && (p.score == 4 || p.score == 5 )).Result.ToString();
                         var allmywocodecount = _wo_repair_baseRepository.Count(p => p.Jwocode == Jwocode
-                                                                      && p.isdelete == 0
-                                                                      && p.wostate == 3
-                                                                      && (p.score == 4 || p.score == 5 )).Result.ToString();
+                                                                     && p.isdelete == 0
+                                                                     && p.wostate == 3
+                                                                     && (p.score == 3||p.score == 4 || p.score == 5)).Result.ToString();
                         var alljbmywocodecount = _wo_repair_baseRepository.Count(p => p.Jwocode == Jwocode
                                                                      && p.isdelete == 0
                                                                      && p.wostate == 3
@@ -3965,7 +3980,8 @@ namespace EquipmentApi.Controllers.workordermanage
                         }
                         else
                         {
-                            double percent = (Convert.ToDouble(allmywocodecount) + Convert.ToDouble(alljbmywocodecount) * 0.8) / Convert.ToDouble(wfinishcount);
+                            //double percent = (Convert.ToDouble(allmywocodecount) + Convert.ToDouble(alljbmywocodecount) * 0.8) / Convert.ToDouble(wfinishcount);
+                            double percent = Convert.ToDouble(allmywocodecount)  / Convert.ToDouble(wfinishcount);
                             mydblcount = percent.ToString("0.00%");//满意度
                         }
                         #endregion
@@ -4063,9 +4079,9 @@ namespace EquipmentApi.Controllers.workordermanage
                     daytjinfo.finishlv = finishlv;         //完成单率
                     daytjinfo.nofinnishlv = nofinnishlv;    //未完成率
                     daytjinfo.mywocode = mywocode;//满意
-                    daytjinfo.ybwocode = ybwocode;//一般
+                    //daytjinfo.ybwocode = ybwocode;//一般
                     daytjinfo.cwocode = cwocode;//差
-                    //daytjinfo.wfinishcount = wfinishcounts;//完结数量
+                    daytjinfo.wfinishcount = wfinishcounts;//完结数量
                     daytjinfo.mydinfo = mydblcount;//满意度
                     daytjinfo.comfrom = byformcount;//本院
                     daytjinfo.comfrombl = comfrombl;//本院率  
@@ -4152,12 +4168,18 @@ namespace EquipmentApi.Controllers.workordermanage
                             //先获取所有满意的班组内的工单数量
                             //double percent = Convert.ToDouble(2) / Convert.ToDouble(34);
                             //string result = percent.ToString("0.000%");//得到5.882%
+                            //var allmywocodecount = _wo_repair_baseRepository.Count(p => p.createtime >= startime
+                            //                                             && p.createtime <= endtime
+                            //                                              && p.Jwocode == Jwocode
+                            //                                              && p.isdelete == 0
+                            //                                              && p.wostate == 3
+                            //                                              && (p.score == 4 || p.score == 5 )).Result.ToString();
                             var allmywocodecount = _wo_repair_baseRepository.Count(p => p.createtime >= startime
-                                                                         && p.createtime <= endtime
-                                                                          && p.Jwocode == Jwocode
-                                                                          && p.isdelete == 0
-                                                                          && p.wostate == 3
-                                                                          && (p.score == 4 || p.score == 5 )).Result.ToString();
+                                                                        && p.createtime <= endtime
+                                                                         && p.Jwocode == Jwocode
+                                                                         && p.isdelete == 0
+                                                                         && p.wostate == 3
+                                                                         && (p.score == 3||p.score == 4 || p.score == 5)).Result.ToString();
                             //基本满意数量
                             var alljbmywocodecount = _wo_repair_baseRepository.Count(p => p.createtime >= startime
                                                                          && p.createtime <= endtime
@@ -4176,7 +4198,8 @@ namespace EquipmentApi.Controllers.workordermanage
                             }
                             else
                             {
-                                double percent = (Convert.ToDouble(allmywocodecount)+Convert.ToDouble(alljbmywocodecount)*0.8) / Convert.ToDouble(wfinishcount);
+                                //double percent = (Convert.ToDouble(allmywocodecount)+Convert.ToDouble(alljbmywocodecount)*0.8) / Convert.ToDouble(wfinishcount);
+                                double percent = Convert.ToDouble(allmywocodecount)/ Convert.ToDouble(wfinishcount);
                                 mydblcount = percent.ToString("0.00%");//满意度
                             }
                             #endregion
@@ -4311,10 +4334,14 @@ namespace EquipmentApi.Controllers.workordermanage
                             //先获取所有满意的班组内的工单数量
                             //double percent = Convert.ToDouble(2) / Convert.ToDouble(34);
                             //string result = percent.ToString("0.000%");//得到5.882%
+                            //var allmywocodecount = _wo_repair_baseRepository.Count(p => p.Jwocode == Jwocode
+                            //                                              && p.isdelete == 0
+                            //                                              && p.wostate == 3
+                            //                                              && (p.score == 4 || p.score == 5 )).Result.ToString();
                             var allmywocodecount = _wo_repair_baseRepository.Count(p => p.Jwocode == Jwocode
-                                                                          && p.isdelete == 0
-                                                                          && p.wostate == 3
-                                                                          && (p.score == 4 || p.score == 5 )).Result.ToString();
+                                                                         && p.isdelete == 0
+                                                                         && p.wostate == 3
+                                                                         && (p.score == 3||p.score == 4 || p.score == 5)).Result.ToString();
                             //基本满意数量
                             var alljbmywocodecount = _wo_repair_baseRepository.Count(p => p.createtime >= startime
                                                                          && p.createtime <= endtime
@@ -4330,7 +4357,8 @@ namespace EquipmentApi.Controllers.workordermanage
                             }
                             else
                             {
-                                double percent = (Convert.ToDouble(allmywocodecount) + Convert.ToDouble(alljbmywocodecount) * 0.8) / Convert.ToDouble(wfinishcount);
+                                //double percent = (Convert.ToDouble(allmywocodecount) + Convert.ToDouble(alljbmywocodecount) * 0.8) / Convert.ToDouble(wfinishcount);
+                                double percent = Convert.ToDouble(allmywocodecount) / Convert.ToDouble(wfinishcount);
                                 mydblcount = percent.ToString("0.00%");//满意度
                             }
                             #endregion
@@ -4427,9 +4455,9 @@ namespace EquipmentApi.Controllers.workordermanage
                         daytjinfo.finishlv = finishlv;         //完成单率
                         daytjinfo.nofinnishlv = nofinnishlv;    //未完成率
                         daytjinfo.mywocode = mywocode;//满意
-                        daytjinfo.ybwocode = ybwocode;//一般
+                        //daytjinfo.ybwocode = ybwocode;//一般
                         daytjinfo.cwocode = cwocode;//差
-                        //daytjinfo.wfinishcount = wfinishcounts;//完结数量
+                        daytjinfo.wfinishcount = wfinishcounts;//完结数量
                         daytjinfo.mydinfo = mydblcount;//满意度
                         daytjinfo.comfrom = byformcount;//本院
                         daytjinfo.comfrombl = comfrombl;//本院率  
@@ -8160,6 +8188,53 @@ namespace EquipmentApi.Controllers.workordermanage
             }
         }
         #endregion
+        #region 修改超时工单
+        [HttpPost("updatecs")]
+        public async Task<IActionResult> UpdateAsynccs(WoRepairBaseInput input)
+        {
+          
+
+            var clmodel = await _wo_repair_baseRepository.GetSingle(input.id);
+            if (clmodel != null)// && clmodel.createuser == optuser  (int)EnumWorkOrderState.create
+            {
+                clmodel.wxtimeid = input.wxtimeid;
+                clmodel.wostate =2;
+                clmodel.wxtimecenter = "";
+                var res = await _wo_repair_baseRepository.UpdateOne(clmodel);
+                if (res)
+                {
+                    return Success("超时工单修改成功");
+                }
+                else
+                    return Error("工单保存失败");
+            }
+
+            return Error("工单不存在或工单不为新工单");
+        }
+        /// <summary>
+        /// 根据班组获取维修项目时效
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpGet("updatecsbybz")]
+        public async Task<IActionResult> UpdateAsynccsbybz(string Jwocode)
+        {
+            var model = await _ISys_Role_InfoRepository.Get(p=>p.role_name==Jwocode);
+            var bzid = "";
+            foreach (var item in model)
+            {
+                bzid = item.id;
+            }
+            if (model != null)
+            {
+                var clmodel = await _wxwpstimeRepository.Get(p=>p.bzid==bzid);
+                return Success("成功",clmodel);
+
+            }
+            return Error("工单不存在或工单不为新工单");
+        }
+
+        #endregion
         #region 获取超时工单
         [HttpGet("getcswocodelist")]
         public async Task<IActionResult> getcswocodelist(string stime, string etime,string phone,int pageindex = 1, int pagesize=10)

代码/MadRunFabric.EquipmentApi/EquipmentApi/Model/Input/WoRepairBaseInput.cs

@@ -17,7 +17,10 @@ namespace EquipmentApi.Model.Input
         /// 工单编号
         /// </summary>
         public string wocode { get; set; } = "";
-
+        /// <summary>
+        /// 接单班组
+        /// </summary>
+        public string Jwocode { get; set; }
         /// <summary>
         /// 通话标识ID
         /// </summary>

代码/MadRunFabric.EquipmentApi/EquipmentApi/Startup.cs

@@ -142,8 +142,10 @@ namespace EquipmentApi
 
             services.AddMvc(options =>
             {
-                options.Filters.Add(new ActionFilter());
-                options.Filters.Add(new ExceptionFilter());
+                //options.Filters.Add(new ActionFilter());
+                //options.Filters.Add(new ExceptionFilter());
+                options.Filters.Add<ActionFilter>();
+                options.Filters.Add<ExceptionFilter>();
             }).AddJsonOptions(op => op.SerializerSettings.ContractResolver =
                                         new Newtonsoft.Json.Serialization.DefaultContractResolver());
            

代码/MadRunFabric.EquipmentApi/EquipmentApi/appsettings.Development_Base.json

@@ -49,7 +49,8 @@
   },
   "eureka": {
     "client": {
-      "serviceUrl": "http://192.168.5.42:28100/eureka/"
+      //"serviceUrl": "http://192.168.5.42:28100/eureka/"
+      "serviceUrl": "http://192.168.5.46:28100/eureka/"
       //"shouldFetchRegistry": false
     },
     "instance": {

代码/MadRunFabric.EquipmentApi/EquipmentApi/appsettings.json

@@ -13,6 +13,10 @@
 
     }
   },
+  "IsLogin": "0",
+  "AuthDate": "2022-01-28",
+  "Remind": "7",
+
   "PushMessageOptions": {
     "URL": "http://192.168.5.46:28000/", //接口API网址122.114.109.238
     "HOST": "http://sdk.open.api.igexin.com/apiex.htm", //参数设置 - http的域名

代码/MadRunFabric.SignTokenApi/SignTokenApi/Controllers/TokenController.cs

@@ -55,6 +55,11 @@ namespace SignTokenApi.Controllers
         [HttpPost("login")]
         public async Task<IActionResult> Login(string usercode, string password, int channel = 1, string returnUrl = null)
         {
+            if (_configuration["IsLogin"] == "0")
+            {
+                return Error("系统异常，请稍后重试");
+            }
+
             #region 获取ip地址
             var ip = IPHelper.GetIp(this.HttpContext);
             #endregion
@@ -127,12 +132,26 @@ namespace SignTokenApi.Controllers
             #endregion
 
             await AddLogAsync(user.username, usercode, "登录成功", ip, channel);
+           var info = "";
             //#region 判断属于哪个坐席
             ////zxz是364  kfz365
             ////获取坐席组信息
             //var groupinfo = user.groupid;
 
             //#endregion
+
+            ////提示授权到期还有多少天
+            //string info = "";
+            //DateTime dateauth = DateTime.Parse(_configuration["AuthDate"]);
+            //int Reminddays = int.Parse(_configuration["Reminddays"]);
+            //var days = (dateauth - DateTime.Now).TotalDays;
+            //if (days < Reminddays)
+            //{
+            //    info = "距离授权到期还有"+ days + "天，请联系厂家";
+
+            //}   
+
+
             var result = new
             {
                 username = user.username,
@@ -151,7 +170,9 @@ namespace SignTokenApi.Controllers
                 weixin = user.weixin,
                 weixin_name = user.weixin_name,
                 weixin_img = user.weixin_img,
-                remark=user.remark
+                remark=user.remark,               
+                returninfo=info
+
             };
 
             return Success("登录成功！", result);

代码/MadRunFabric.SignTokenApi/SignTokenApi/Startup.cs

@@ -138,8 +138,8 @@ namespace SignTokenApi
 
             services.AddMvc(options =>
             {
-                options.Filters.Add(new ActionFilter());
-                options.Filters.Add(new ExceptionFilter());
+                options.Filters.Add<ActionFilter>();
+                options.Filters.Add<ExceptionFilter>();
             }).AddJsonOptions(op => op.SerializerSettings.ContractResolver =
                                         new Newtonsoft.Json.Serialization.DefaultContractResolver());
 

代码/MadRunFabric.SignTokenApi/SignTokenApi/appsettings.json

@@ -11,5 +11,8 @@
         "Default": "Warning"
       }
     }
-  }
-}
+  },
+  "IsLogin": "1",
+  "AuthDate": "2022-01-28",
+  "Remind": "7"
+}

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

@@ -29,6 +29,14 @@ namespace TestUserTypeApi.Model.Dto
         /// </summary>
         public string Hzname { get; set; }
         /// <summary>
+        /// 性别
+        /// </summary>
+        public string HzGender { get; set; }
+        /// <summary>
+        /// 年龄
+        /// </summary>
+        public string Hzage { get; set; }
+        /// <summary>
         /// 预约科室
         /// </summary>
         public string Hzyyks { get; set; }

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

@@ -34,6 +34,7 @@ using System.Drawing;
 using System.Drawing.Drawing2D;
 using SqlSugar;
 using System.Common;
+using Microsoft.AspNetCore.Http;
 
 // For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
 
@@ -4092,6 +4093,7 @@ namespace TestUserTypeApi.Controllers
                     list.Add(model);
                 }
                 NPOIHelper npoi = new NPOIHelper();
+                list = list.OrderByDescending(p => p.Szzydjsj).ToList();
                 var tb = ModelConvertHelper<Szzys>.ListToTable(list,null);
                 if (tb != null)
                 {
@@ -4427,7 +4429,8 @@ namespace TestUserTypeApi.Controllers
                     list.Add(model);
                 }
                 NPOIHelper npoi = new NPOIHelper();
-                var tb = ModelConvertHelper<Szzys>.ListToTable(list, null);
+                list = list.OrderByDescending(p => p.Szzydjsj).ToList();
+                var tb = ModelConvertHelper<Szmzs>.ListToTable(list, null);
                 if (tb != null)
                 {
                     //导出dtnew 
@@ -4712,7 +4715,8 @@ namespace TestUserTypeApi.Controllers
                     list.Add(model);
                 }
                 NPOIHelper npoi = new NPOIHelper();
-                var tb = ModelConvertHelper<Szzys>.ListToTable(list, null);
+                list = list.OrderByDescending(p => p.Szzydjsj).ToList();
+                var tb = ModelConvertHelper<Szjcs>.ListToTable(list, null);
                 if (tb != null)
                 {
                     //导出dtnew 
@@ -5002,11 +5006,12 @@ namespace TestUserTypeApi.Controllers
                     list.Add(model);
                 }
                 NPOIHelper npoi = new NPOIHelper();
-                var tb = ModelConvertHelper<Szzys>.ListToTable(list, null);
+                list = list.OrderByDescending(p => p.Szzydjsj).ToList();
+                var tb = ModelConvertHelper<Xzzls>.ListToTable(list, null);
                 if (tb != null)
                 {
                     //导出dtnew 
-                    string[] cols = { "登记时间", "转诊单位", "转诊医师",  "患者姓名", "患者性别", "患者年龄", "检查项目",   "转诊目的","就诊时间", "责任人" };
+                    string[] cols = { "登记时间", "转诊单位", "转诊医师",  "患者姓名", "患者性别", "患者年龄", "检查项目",   "转诊目的","就诊时间", "登记人" };
 
                     byte[] sm = npoi.ExportToExcel1(tb, cols);
                     if (sm != null)
@@ -5027,7 +5032,47 @@ namespace TestUserTypeApi.Controllers
             }
 
         }
+        /// <summary>
+        /// 上传文件并将设备信息导入数据库
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("importexcelxzzl")]
+        public async Task<IActionResult> ImportExcelxzzl(IFormCollection cols,int headrow = 0)
+        {
+            //Microsoft.AspNetCore.Http.IFormFile _upfile1 = Request.Form.Files[0];
+
+            Microsoft.AspNetCore.Http.IFormFile _upfile=cols.Files[0];
+            if (!_upfile.ContentType.Equals("application/vnd.ms-excel") && !_upfile.ContentType.Equals("application/x-xls") && !_upfile.ContentType.Equals("application/x-xlsx") && !_upfile.ContentType.Equals("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") && !_upfile.ContentType.Equals("application/octet-stream"))
+                return Error($"请正确上传Excel文件：file.ContentType={_upfile.ContentType}");
+
+            NPOIHelper npoi = new NPOIHelper();
+            var dtExcel = npoi.ExcelToTable1(_upfile, headrow);
+            int num = dtExcel.Rows.Count;
+            if (num > 0)
+            {
+                foreach (System.Data.DataRow dr in dtExcel.Rows)
+                {
+                    //                    
 
+                    Xzzls model = new Xzzls();
+                    model.Hzlxfs = "";//联系方式
+                    model.isdelete = 0;
+                    model.Szzydjsj = Convert.ToDateTime(dr["登记时间"].ToString());//登记时间
+                    model.Szzyzzdw = dr["转诊单位"].ToString();//转诊单位
+                    model.Szzydjsj = Convert.ToDateTime(dr["登记时间"].ToString());//登记时间
+                    model.Szzyzzys = dr["转诊医师"].ToString();//转诊医师
+                    model.Hzname = dr["患者姓名"].ToString();//患者姓名
+                    model.HzGender = dr["患者性别"].ToString();//患者性别
+                    model.Hzage = dr["患者年龄"].ToString();//患者年龄
+                    model.Hzjcxm = dr["检查项目"].ToString();//检查项目
+                    model.Syzzzzmd = dr["转诊目的"].ToString();//转诊目的
+                    model.Xyjzsj = Convert.ToDateTime(dr["就诊时间"].ToString());//就诊时间
+                    model.Syzzzrr = dr["登记人"].ToString();//登记人
+                    bool b = await _IXzzlsRepository.Add(model);
+                }
+            }
+            return Success("导入成功");
+        }
         #endregion
         #region 下转住院
         /// <summary>
@@ -5317,7 +5362,8 @@ namespace TestUserTypeApi.Controllers
                     list.Add(model);
                 }
                 NPOIHelper npoi = new NPOIHelper();
-                var tb = ModelConvertHelper<Szzys>.ListToTable(list, null);
+                list = list.OrderByDescending(p => p.Szzydjsj).ToList();
+                var tb = ModelConvertHelper<Xzzys>.ListToTable(list, null);
                 if (tb != null)
                 {
                     //导出dtnew 
@@ -5619,7 +5665,8 @@ namespace TestUserTypeApi.Controllers
                     list.Add(model);
                 }
                 NPOIHelper npoi = new NPOIHelper();
-                var tb = ModelConvertHelper<Szzys>.ListToTable(list, null);
+                list = list.OrderByDescending(p => p.Szzydjsj).ToList();
+                var tb = ModelConvertHelper<Wjzqjs>.ListToTable(list, null);
                 if (tb != null)
                 {
                     //导出dtnew 
@@ -5850,7 +5897,8 @@ namespace TestUserTypeApi.Controllers
                     list.Add(model);
                 }
                 NPOIHelper npoi = new NPOIHelper();
-                var tb = ModelConvertHelper<Szzys>.ListToTable(list, null);
+                list = list.OrderByDescending(p => p.Szzydjsj).ToList();
+                var tb = ModelConvertHelper<Bbsqs>.ListToTable(list, null);
                 if (tb != null)
                 {
                     //导出dtnew 
@@ -6062,7 +6110,8 @@ namespace TestUserTypeApi.Controllers
                     list.Add(model);
                 }
                 NPOIHelper npoi = new NPOIHelper();
-                var tb = ModelConvertHelper<Szzys>.ListToTable(list, null);
+                list = list.OrderByDescending(p => p.Hzsj).ToList();
+                var tb = ModelConvertHelper<Hzaps>.ListToTable(list, null);
                 if (tb != null)
                 {
                     //导出dtnew 
@@ -6227,6 +6276,8 @@ namespace TestUserTypeApi.Controllers
             tp.Szzyyyys = tps.Szzyyyys;//预约医师
             tp.Yylxfs = tps.Yylxfs;//联系方式
             tp.Hzname = tps.Hzname;//患者姓名
+            tp.HzGender = tps.HzGender;//患者性别
+            tp.Hzage = tps.Hzage;//患者年龄
             tp.Hzyyks = tps.Hzyyks;//预约科室
             tp.Hzlxfs = tps.Hzlxfs;//联系方式
             tp.Syyysj = tps.Syyysj;//预约时间
@@ -6259,6 +6310,8 @@ namespace TestUserTypeApi.Controllers
             tp.Szzyyyys = tps.Szzyyyys;//预约医师
             tp.Yylxfs = tps.Yylxfs;//联系方式
             tp.Hzname = tps.Hzname;//患者姓名
+            tp.HzGender = tps.HzGender;//患者性别
+            tp.Hzage = tps.Hzage;//患者年龄
             tp.Hzyyks = tps.Hzyyks;//预约科室
             tp.Hzlxfs = tps.Hzlxfs;//联系方式
             tp.Syyysj = tps.Syyysj;//预约时间
@@ -6351,6 +6404,8 @@ namespace TestUserTypeApi.Controllers
                 model.Szzyyyys = item.Szzyyyys;//预约医师
                 model.Yylxfs = item.Yylxfs;//联系方式
                 model.Hzname = item.Hzname;//患者姓名
+                model.HzGender = item.HzGender;//患者性别
+                model.Hzage = item.Hzage;//患者年龄
                 model.Hzyyks = item.Hzyyks;//预约科室
                 model.Hzlxfs = item.Hzlxfs;//联系方式
                 model.Syyysj = item.Syyysj;//预约时间
@@ -6399,6 +6454,8 @@ namespace TestUserTypeApi.Controllers
                     model.Szzyyyys = item.Szzyyyys;//预约医师
                     model.Yylxfs = item.Yylxfs;//联系方式
                     model.Hzname = item.Hzname;//患者姓名
+                    model.HzGender = item.HzGender;//患者性别
+                    model.Hzage = item.Hzage;//患者年龄
                     model.Hzyyks = item.Hzyyks;//预约科室
                     model.Hzlxfs = item.Hzlxfs;//联系方式
                     model.Syyysj = item.Syyysj != null ? Convert.ToDateTime(item.Syyysj).ToString("yyyy - MM - dd  HH: mm:ss") : "";//预约时间
@@ -6407,11 +6464,12 @@ namespace TestUserTypeApi.Controllers
                     list.Add(model);
                 }
                 NPOIHelper npoi = new NPOIHelper();
-                var tb = ModelConvertHelper<Szzys>.ListToTable(list, null);
+                list = list.OrderByDescending(p => p.Szzydjsj).ToList();
+                var tb = ModelConvertHelper<Yyzls>.ListToTable(list, null);
                 if (tb != null)
                 {
                     //导出dtnew 
-                    string[] cols = { "会诊时间", "申请会诊机构", "申请会诊医师", "联系方式", "会诊专家", "成功未成功", "诊后追踪服务", "责任人" };
+                    string[] cols = { "登记日期", "预约单位", "预约医师", "联系方式", "患者姓名", "患者性别", "患者年龄", "预约科室", "联系方式", "预约时间", "责任人" };
 
                     byte[] sm = npoi.ExportToExcel1(tb, cols);
                     if (sm != null)

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi/Model/exportexcelyyzl.cs

@@ -12,6 +12,8 @@ namespace TestUserTypeApi.Model
         public string Szzyyyys   {get;set;}//预约医师
         public string Yylxfs     {get;set;}//联系方式
         public string Hzname     {get;set;}//患者姓名
+        public string HzGender { get; set; }// 性别
+        public string Hzage { get; set; }// 年龄
         public string Hzyyks     {get;set;}//预约科室
         public string Hzlxfs     {get;set;}//联系方式
         public string Syyysj     {get;set;}//预约时间

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi/Startup.cs

@@ -172,8 +172,8 @@ namespace TestUserTypeApi
 
             services.AddMvc(options =>
             {
-                options.Filters.Add(new ActionFilter());
-                options.Filters.Add(new ExceptionFilter());
+                options.Filters.Add<ActionFilter>();
+                options.Filters.Add<ExceptionFilter>();
             }).AddJsonOptions(op => op.SerializerSettings.ContractResolver =
                                         new Newtonsoft.Json.Serialization.DefaultContractResolver());
 

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi/appsettings.Development_Base.json

@@ -57,7 +57,8 @@
     "params": "uploadtype=excel",
     "acotmbname": "自动外呼号码导入模板.xlsx",
     "acotmbkeys": "姓名,电话,住址",
-    "acotdbkeys": "cusname,phone,cusaddr"
+    "acotdbkeys": "cusname,phone,cusaddr",
+    "dbkeys": "Szzydjsj,Szzyzzdw,Szzyzzys,Hzname,HzGender,Hzage,Hzjcxm,Syzzzzmd,Xyjzsj,Syzzzrr"
   },
   "eureka": {
     "client": {

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi/appsettings.json

@@ -5,5 +5,8 @@
       "Default": "Warning"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",   
+  "IsLogin": "0",
+  "AuthDate": "2022-01-28",
+  "Remind": "7"
 }

代码/新建文本文档.txt

@@ -0,0 +1,3 @@
+距离授权到期还有x天，请联系厂家
+
+授权已到期，请联系厂家