急标本更新

RMYY_CallCenter_Api.Model/T_Dis_WorkOrder.cs

         }
         #endregion Model
 
+        #region 扩展model
+        /// <summary>
+        /// 工单状态
+        /// </summary>
+        public string F_Wostate { get; set; }
+        /// <summary>
+        /// 坐席
+        /// </summary>
+        public string F_SitMan { get; set; }
+        #endregion
+
     }
 }

RMYY_CallCenter_Api/Controllers/CallTel/CallrecordsController.cs

             }
             if (starttime.Trim() != "")
             {
-                sql += " and BeginTime>='" + starttime + "' ";
+                sql += " and BeginTime>='"+ Convert.ToDateTime(starttime).ToString("yyyy-MM-dd") + " 00:00:00" + "' ";
             }
             if (endtime.Trim() != "")
             { 
-                sql += " and BeginTime<='" + endtime + "' ";
+                sql += " and BeginTime<='" + Convert.ToDateTime(endtime).ToString("yyyy-MM-dd") + " 23:59:59" + "' ";
             }
             if(extnumber.Trim()!="")
             {
 
             if (starttime.Trim() != "")
             {
-                sql += " and BeginTime>= '" + starttime + "' ";
+                sql += " and BeginTime>= '" + Convert.ToDateTime(starttime).ToString("yyyy-MM-dd")+ " 00:00:00" + "' ";
             }
             if (endtime.Trim() != "")
             {
-                sql += " and BeginTime<='" + endtime + "' ";
+                sql += " and BeginTime<='" + Convert.ToDateTime(endtime).ToString("yyyy-MM-dd")+ " 23:59:59" + "' ";
             }
 
             int recordCount = 0;

RMYY_CallCenter_Api/Controllers/WorkOrder/Con_WorkOrderController.cs

                 }
                 if (User.F_UserCode != "8000")
                 {
-                    if (User.F_RoleCode == "ZXZ")//坐席组看不到自己创建的工单
-                    {
-                        sql += $" and F_ID<0";
+                    sql += $" and F_CreateUser=" + User.F_UserCode;
 
-                    }
-                    else
+                    if (User.F_RoleCode == "HSZ")//护士长角色
                     {
-                        sql += $" and F_CreateUser=" + User.F_UserCode;
-
-                        if (User.F_RoleCode == "HSZ")//护士长角色
+                        string idstr = GetGongDanId(User.F_UserCode);
+                        if (!string.IsNullOrEmpty(idstr))
                         {
-                            string idstr = GetGongDanId(User.F_UserCode);
-                            if (!string.IsNullOrEmpty(idstr))
-                            {
-                                sql += $" or F_ID in (" + idstr + ")";
-                            }
+                            sql += $" or F_ID in (" + idstr + ")";
                         }
-                        if (User.F_RoleCode == "BZ")//行风办
+                    }
+                    if (User.F_RoleCode == "BZ")//行风办
+                    {
+                        transql = GetTranPersonsql(User.F_UserCode);
+                        if (transql != "")
                         {
-                            transql = GetTranPersonsql(User.F_UserCode);
-                            if (transql != "")
-                            {
-                                sql += $" or F_Id in (" + transql + ")";
-                                wokerlist = transql.Split(',').Distinct().ToList();
-                            }
+                            sql += $" or F_Id in (" + transql + ")";
+                            wokerlist = transql.Split(',').Distinct().ToList();
                         }
                     }
                 }
         /// </summary>
         private Model.T_Con_WorkOrder inputtoobj(Model.T_Con_WorkOrder model, Con_WorkOrderInput input, int type)
         {
-            string usercode = "8000";
+            string usercode = User.F_UserCode;
             var newmodel = model;
             if (input.F_ID != 0)
             {
             else
             {               
                 model.F_State = (int)EnumWorkOrderState.neworder;//0
-                model.F_CreateUser = usercode;
+                model.F_CreateUser = User.F_UserCode;
+                model.F_CreateUserName = User.F_UserName;
                 model.F_CreateTime = DateTime.Now;//添加时间
             }
             model.F_IsDel = 0;

RMYY_CallCenter_Api/Controllers/WorkOrder/T_Dis_WorkOrderController.cs

         Bll.T_Dis_WorkOrder orderbll = new Bll.T_Dis_WorkOrder();
         Bll.T_Dis_WorkOrderItem itembll = new Bll.T_Dis_WorkOrderItem();
         Bll.T_Sys_Department dptbll = new Bll.T_Sys_Department();
-
-
-
         /// <summary>
         /// 获取列表
         /// </summary>
         /// <param name="pagesize"></param>
         /// <param name="state"></param>
         /// <returns></returns>
-        public ActionResult GetList(string keyword,int type, string starttime = "", string endtime = "", int pageindex = 1, int pagesize = 10, int state = -1)
+        public ActionResult GetList(string keyword,int type=0, string starttime = "", string endtime = "", int pageindex = 1, int pagesize = 10, int state = -1)
         {
-            string usercode = "8000";
-            if (usercode != "")
+            if (User!= null)
             {
-                var ua = userbll.GetModel(usercode);
                 string transql = "";
                 List<string> wokerlist = new List<string>();
                 #region 查询条件
                 {
                     sql += $"and F_State=" + state;
                 }
-                if (ua.F_DeptId == 1)//综合保障中心
+                if (User.F_DeptId == 1)//综合保障中心
                 {
-                    if (ua.F_UserCode != "8000" && ua.F_RoleId != 1003)
-                        sql += $" and F_ControlManCode=" + ua.F_UserCode;
+                    if (User.F_UserCode != "8000" && User.F_RoleCode != "ZYY")
+                        sql += $" and F_ControlManCode=" + User.F_UserCode;
                 }
-                else if (ua.F_DeptId == 3002)//申请科室
+                else if (User.F_DeptId == 3002)//申请科室
                 {
-                    sql += $" and F_CreateCode=" + ua.F_UserCode + "";
+                    sql += $" and F_CreateCode=" + User.F_UserCode + "";
                 }
-                if (ua.F_DeptId == 1 && ua.F_RoleId == 1003)//转运人判断
+                if (User.F_DeptId == 1 && User.F_RoleCode == "ZYY")//转运人判断
                 {
-                    transql = GetTranPersonsql(usercode, ua.F_RoleId,type);
-                    string assignsql = GetTransql(usercode,type);
+                    transql = GetTranPersonsql(User.F_UserCode,type);
+                    string assignsql = GetTransql(User.F_UserCode,type);
                     if (assignsql != "" && transql != "")
                     {
-                        sql += $" and (F_Id in (" + transql + ") or F_Id in (" + assignsql + "))";
+                        //sql += $" and (F_Id in (" + transql + ") or F_Id in (" + assignsql + "))";
                         wokerlist = (transql + "," + assignsql).Split(',').Distinct().ToList();
                     }
                     else if (transql != "")
                     {
-                        sql += $" and F_Id in (" + transql + ")";
+                        //sql += $" and F_Id in (" + transql + ")";
                         wokerlist = transql.Split(',').Distinct().ToList();
                     }
                     else if (assignsql != "")
                     {
-                        sql += $" and F_Id in (" + assignsql + ")";
+                        //sql += $" and F_Id in (" + assignsql + ")";
                         wokerlist = assignsql.Split(',').Distinct().ToList();
                     }
+                    sql += $" and F_Id in (" + string.Join(",", wokerlist)  + ")";
                 }
                 #endregion
                 int recordCount = 0;
                 var modellist = orderbll.DataTableToList(data);
                 if (modellist.Count > 0)
                 {
-                    if (wokerlist.Count > 0 || ua.F_RoleId== 1003)
+                    //if (wokerlist.Count > 0 || User.F_UserCode== "ZYY")
+                    //{
+                    foreach (var item in modellist)
                     {
-                        var obj = new
+                        if (wokerlist.Count > 0 || User.F_RoleCode == "ZYY")
                         {
-                            state = "success",
-                            message = "成功",
-                            rows = modellist.Where(p => wokerlist.Contains(p.F_Id.ToString())).Select(p =>
-                            new
-                            {
-                                Wostate = GetWoStateName(p.F_Id,ua.F_UserCode),
-                                SitMan = p.F_ControlManName + '(' + p.F_ControlManName + ')',
-                                modellist = p
-                            }),
-                            total = recordCount
-                        };
-                        return Content(obj.ToJson());
-                    }
-                    else
-                    {
-                        var obj = new
+                            item.F_Wostate = GetWoStateName(item.F_Id, User.F_UserCode);
+                        }
+                        else
                         {
-                            state = "success",
-                            message = "成功",
-                            rows = modellist.Select(p =>
-                            new
-                            {
-                                Wostate = EnumHelper.GetDescription((EnumDisWorkOrderState)p.F_State),
-                                SitMan = p.F_ControlManName + '(' + p.F_ControlManName + ')',
-                                modellist = p
-                            }),
-                            total = recordCount
-                        };
-                        return Content(obj.ToJson());
+                            item.F_Wostate = EnumHelper.GetDescription((EnumDisWorkOrderState)item.F_State);
+                        }
+                        item.F_SitMan = item.F_ControlManName + '(' + item.F_ControlManCode + ')';
 
                     }
+                    var obj = new
+                    {
+                        state = "success",
+                        message = "成功",
+                        rows = modellist,
+                        total = recordCount
+                    };
+                    return Content(obj.ToJson());
+                    //}
+                    //else
+                    //{
+                    //    var obj = new
+                    //    {
+                    //        state = "success",
+                    //        message = "成功",
+                    //        rows = modellist.Where(p => wokerlist.Contains(p.F_Id.ToString())).Select(p =>
+                    //        new
+                    //        {
+                    //            Wostate = EnumHelper.GetDescription((EnumDisWorkOrderState)p.F_State),
+                    //            SitMan = p.F_ControlManName + '(' + p.F_ControlManName + ')',
+                    //            modellist = p
+                    //        }),
+                    //        total = recordCount
+                    //    };
+                    //    return Content(obj.ToJson());
+
+                    //}
                 }
                 else return Error("暂无工单记录");
             }
         private string GetTransql(string usercode, int type)
         {
             string str = string.Empty;
-            var list = itembll.GetModelList("F_OptType=" + (int)EnumDisItemOpt.assign + "and F_IsUsed='0' and F_WoType=" + type + " and F_WoState=" + (int)EnumDisWorkOrderState.assign + " and F_NextUser=" + usercode + " ").Select(t => t.F_WoID).Distinct().ToList();
+            var list = itembll.GetModelList("F_OptType=" + (int)EnumDisItemOpt.assign + " and F_WoType=" + type + " and F_WoState=" + (int)EnumDisWorkOrderState.assign + " and F_NextUser=" + usercode + " ").Select(t => t.F_WoID).Distinct().ToList();
             if (list.Count > 0)
                 foreach (var item in list)
                 {
         /// <param name="usercode"></param>
         /// <param name="roleid"></param>
         /// <returns></returns>
-        private string GetTranPersonsql(string usercode, int roleid, int type)
+        private string GetTranPersonsql(string usercode, int type)
         {
             string wokerlist = "";
             string[] wokerarr = { };
-            if (userbll.GetModel(usercode).F_RoleId == roleid)
+            var itemlist = itembll.GetModelList("F_CreateUser=" + usercode + "and F_WoType=" + type + "").Select(t => t.F_WoID).Distinct<long>().ToList();
+            if (itemlist.Count > 0)
             {
-                var itemlist = itembll.GetModelList("F_CreateUser=" + usercode + "and F_WoType=" + type + " and F_IsUsed='0'").Select(t => t.F_WoID).Distinct<long>().ToList();
-                if (itemlist.Count > 0)
+                foreach (var item in itemlist)
                 {
-                    foreach (var item in itemlist)
-                    {
-                        wokerlist = string.IsNullOrEmpty(wokerlist) ? item.ToString() : wokerlist + "," + item.ToString();
-                    }
-                    if (wokerlist != "")
-                        wokerarr = wokerlist.Split(',');
+                    wokerlist = string.IsNullOrEmpty(wokerlist) ? item.ToString() : wokerlist + "," + item.ToString();
                 }
+                if (wokerlist != "")
+                    wokerarr = wokerlist.Split(',');
             }
             return wokerlist;
         }
         /// <returns></returns>
         public ActionResult GetModelDetail(int id)
         {
-            string ucode = "8000";
             string sql = "F_WoID = " + id + "";
-            Model.T_Sys_UserAccount ua = userbll.GetModel(ucode);
             if (id <= 0)
             {
                 return Error("请选择要查询的工单！");
         /// <returns></returns>
         public ActionResult GetListExpt(int type,string keyword, string starttime = "", string endtime = "", int state = -1)
         {
-            string usercode = "8000";
-            if (usercode != "")
+            if (User != null)
             {
                 #region 查询条件
                 if (type != (int)EnumWorkOrder.OrtherDis && type != (int)EnumWorkOrder.UrgDis && type != (int)EnumWorkOrder.RedDis && type != (int)EnumWorkOrder.BloodDis)
         /// <returns></returns>
         public ActionResult UpdateWorkOrder(int woid,int type,int hosid, int deptid, string deptname, string positon, string usercode, string username, string phon, string itemessage, string remark, string callid = "",int isthird = 0, int islarge = 0, string carrytime = "", int number = 0, string pic = "",string orthertype="")
         {
-            //if (User != null)
-            //{
-            string ucode = "6004";
-            var User1 = userbll.GetModel(ucode);
-
-            #region 添加条件
-            if (woid <= 0)
-                return Error("请选择要修改的工单！");
-            if (type != (int)EnumWorkOrder.OrtherDis && type != (int)EnumWorkOrder.UrgDis && type != (int)EnumWorkOrder.RedDis && type != (int)EnumWorkOrder.BloodDis)
-                return Error("工单类型错误！");
-            if (hosid <= 0)
-                return Error("请选择院区！");
-            if (deptid <= 0)
-                return Error("请选择申请部门！");
-            if (usercode == "")
-                return Error("请选择申请人！");
-            if (phon == "")
-                return Error("请输入联系电话！");
-            if (type == (int)EnumWorkOrder.OrtherDis && string.IsNullOrEmpty(orthertype))
+            if (User != null)
             {
-                return Error("请选择配送类型！");
-            }
-            //if (string.IsNullOrEmpty(itemessage))
-            //    return Error("请填写配送信息！");
-            #endregion
 
-            var model = orderbll.GetModel(woid);
-            if (model == null)
-                return Error("不存在此工单信息！");
-            if (model.F_State == (int)EnumDisWorkOrderState.assign || model.F_TransPersonCode != "")
-                return Error("工单已指派不能修改！");
-            model.F_ProposerDeptId = deptid;//申请科室
-            model.F_ProposerDeptName = deptname;//申请科室名称
-            model.F_ProposerCode = usercode;//申请人
-            model.F_ProposerName = username;
-            model.F_ProposerPhon = phon;
-            model.F_BedPosition = positon;//送达地点
-            model.F_Remark = remark;
-            if (!string.IsNullOrEmpty(orthertype))
-                model.F_OrtherType = orthertype;
-            if (type == (int)EnumWorkOrder.OrtherDis && isthird == 1)
-            {
-                model.F_IsThird = 1;
-                model.F_Islarge = islarge;
-                if (!string.IsNullOrEmpty(carrytime))
-                    model.F_CarryTime = Convert.ToDateTime(carrytime);
-            }
-            if (type == (int)EnumWorkOrder.OrtherDis || type == (int)EnumWorkOrder.UrgDis)
-            {
-                #region 信息处理
-                if (string.IsNullOrEmpty(itemessage))
-                    return Error("请填写配送信息！");
-                string[] _list = itemessage.TrimEnd(',').Split(',');
-                string mscontents = "";
-                for (int i = 0; i < _list.Length; i++)
+                #region 添加条件
+                if (woid <= 0)
+                    return Error("请选择要修改的工单！");
+                if (type != (int)EnumWorkOrder.OrtherDis && type != (int)EnumWorkOrder.UrgDis && type != (int)EnumWorkOrder.RedDis && type != (int)EnumWorkOrder.BloodDis)
+                    return Error("工单类型错误！");
+                if (hosid <= 0)
+                    return Error("请选择院区！");
+                if (deptid <= 0)
+                    return Error("请选择申请部门！");
+                if (usercode == "")
+                    return Error("请选择申请人！");
+                if (phon == "")
+                    return Error("请输入联系电话！");
+                if (type == (int)EnumWorkOrder.OrtherDis && string.IsNullOrEmpty(orthertype))
                 {
-                    string[] _temp = _list[i].Split('-');
-                    string itemess = _temp[0];
-                    int num = Convert.ToInt32(_temp[1]);
-
-                    if (num > 0 && itemess != "")
-                    {
-                        mscontents = string.IsNullOrEmpty(mscontents) ? (itemess + ",数量:" + num) : (mscontents + " ； " + itemess + ",数量:" + num);
-                    }
-                    else return Error("配送信息不正确！");
+                    return Error("请选择配送类型！");
                 }
+                //if (string.IsNullOrEmpty(itemessage))
+                //    return Error("请填写配送信息！");
                 #endregion
-                model.F_ItemMessages = itemessage;//配送内容
-                model.F_ItemContents = mscontents;
-                bool n = orderbll.Update(model);
-                if (n)
+
+                var model = orderbll.GetModel(woid);
+                if (model == null)
+                    return Error("不存在此工单信息！");
+                if (model.F_State == (int)EnumDisWorkOrderState.assign || model.F_TransPersonCode != "")
+                    return Error("工单已指派不能修改！");
+                model.F_ProposerDeptId = deptid;//申请科室
+                model.F_ProposerDeptName = deptname;//申请科室名称
+                model.F_ProposerCode = usercode;//申请人
+                model.F_ProposerName = username;
+                model.F_ProposerPhon = phon;
+                model.F_BedPosition = positon;//送达地点
+                model.F_Remark = remark;
+                if (!string.IsNullOrEmpty(orthertype))
+                    model.F_OrtherType = orthertype;
+                if (type == (int)EnumWorkOrder.OrtherDis && isthird == 1)
                 {
-                    AddLog(woid, 0, type, User1.F_UserName + "(" + User1.F_UserCode + ")" + "修改工单", 0, (int)EnumDisItemOpt.update, "", 0, User1);
+                    model.F_IsThird = 1;
+                    model.F_Islarge = islarge;
+                    if (!string.IsNullOrEmpty(carrytime))
+                        model.F_CarryTime = Convert.ToDateTime(carrytime);
                 }
-                else return Error("修改失败");
-            }
-            if (type == (int)EnumWorkOrder.RedDis)
-            {
-                if (number <= 0)
-                    return Error("红处方数量不能为空！");
-                model.F_DisNum = number;//红处方数量
-                model.F_ItemMessages = pic;//红处方图片
-                model.F_ItemContents = "红处方配送";
-                bool n = orderbll.Update(model);
-                if (n)
+                if (type == (int)EnumWorkOrder.OrtherDis || type == (int)EnumWorkOrder.UrgDis)
                 {
-                    AddLog(woid, 0, type, User1.F_UserName + "(" + User1.F_UserCode + ")" + "修改工单", 0, (int)EnumDisItemOpt.update, "", 0, User1);
+                    #region 信息处理
+                    if (string.IsNullOrEmpty(itemessage))
+                        return Error("请填写配送信息！");
+                    string[] _list = itemessage.TrimEnd(',').Split(',');
+                    string mscontents = "";
+                    for (int i = 0; i < _list.Length; i++)
+                    {
+                        string[] _temp = _list[i].Split('-');
+                        string itemess = _temp[0];
+                        int num = Convert.ToInt32(_temp[1]);
+
+                        if (num > 0 && itemess != "")
+                        {
+                            mscontents = string.IsNullOrEmpty(mscontents) ? (itemess + ",数量:" + num) : (mscontents + " ； " + itemess + ",数量:" + num);
+                        }
+                        else return Error("配送信息不正确！");
+                    }
+                    #endregion
+                    model.F_ItemMessages = itemessage;//配送内容
+                    model.F_ItemContents = mscontents;
+                    bool n = orderbll.Update(model);
+                    if (n)
+                    {
+                        AddLog(woid, 0, type, User.F_UserName + "(" + User.F_UserCode + ")" + "修改工单", 0, (int)EnumDisItemOpt.update, "", 0, User);
+                    }
+                    else return Error("修改失败");
                 }
-                else return Error("修改失败");
-            }
-            if (type == (int)EnumWorkOrder.BloodDis)
-            {
-                #region 信息处理
-                if (string.IsNullOrEmpty(itemessage))
-                    return Error("请填写配送信息！");
-                string[] _list = itemessage.TrimEnd(',').Split(',');
-                string mscontents = "";
-                //string deptstr = "";
-                //string[] deptlist = { };
-                for (int i = 0; i < _list.Length; i++)
+                if (type == (int)EnumWorkOrder.RedDis)
                 {
-                    string[] _temp = _list[i].Split('-');
-                    string itemess = _temp[0];
-                    int sendeptid = Convert.ToInt32(_temp[1]);
-                    string sendepatname = _temp[2].ToString();
-                    int num = Convert.ToInt32(_temp[3]);
-
-                    if (num > 0 && itemess != "" && sendepatname != "" && sendeptid > 0)
+                    if (number <= 0)
+                        return Error("红处方数量不能为空！");
+                    model.F_DisNum = number;//红处方数量
+                    model.F_ItemMessages = pic;//红处方图片
+                    model.F_ItemContents = "红处方配送";
+                    bool n = orderbll.Update(model);
+                    if (n)
                     {
-                        //mscontents = string.IsNullOrEmpty(mscontents) ? (itemess + "配送到" + sendepatname + "科室" + ",数量:" + num) : (mscontents + " ； " + itemess + "配送到" + sendepatname + "科室" + ",数量:" + num);
-                        mscontents = itemess + "配送到" + sendepatname + "科室" + ",数量:" + num;
-                        model.F_ItemMessages = itemessage;//配送内容
-                        model.F_ItemContents = mscontents;
-                        var deptmodel = dptbll.GetModel(sendeptid);
-                        if (deptmodel != null)
+                        AddLog(woid, 0, type, User.F_UserName + "(" + User.F_UserCode + ")" + "修改工单", 0, (int)EnumDisItemOpt.update, "", 0, User);
+                    }
+                    else return Error("修改失败");
+                }
+                if (type == (int)EnumWorkOrder.BloodDis)
+                {
+                    #region 信息处理
+                    if (string.IsNullOrEmpty(itemessage))
+                        return Error("请填写配送信息！");
+                    string[] _list = itemessage.TrimEnd(',').Split(',');
+                    string mscontents = "";
+                    //string deptstr = "";
+                    //string[] deptlist = { };
+                    for (int i = 0; i < _list.Length; i++)
+                    {
+                        string[] _temp = _list[i].Split('-');
+                        string itemess = _temp[0];
+                        int sendeptid = Convert.ToInt32(_temp[1]);
+                        string sendepatname = _temp[2].ToString();
+                        int num = Convert.ToInt32(_temp[3]);
+
+                        if (num > 0 && itemess != "" && sendepatname != "" && sendeptid > 0)
                         {
-                            model.F_SendDeptId = sendeptid;
-                            model.F_SendDeptName = sendepatname;
-                            bool tt = orderbll.Update(model);
-                            if (tt)
+                            //mscontents = string.IsNullOrEmpty(mscontents) ? (itemess + "配送到" + sendepatname + "科室" + ",数量:" + num) : (mscontents + " ； " + itemess + "配送到" + sendepatname + "科室" + ",数量:" + num);
+                            mscontents = itemess + "配送到" + sendepatname + "科室" + ",数量:" + num;
+                            model.F_ItemMessages = itemessage;//配送内容
+                            model.F_ItemContents = mscontents;
+                            var deptmodel = dptbll.GetModel(sendeptid);
+                            if (deptmodel != null)
                             {
-                                AddLog(woid, 0, type, User1.F_UserName + "(" + User1.F_UserCode + ")" + "修改工单", 0, (int)EnumDisItemOpt.update, "", 0, User1);
+                                model.F_SendDeptId = sendeptid;
+                                model.F_SendDeptName = sendepatname;
+                                bool tt = orderbll.Update(model);
+                                if (tt)
+                                {
+                                    AddLog(woid, 0, type, User.F_UserName + "(" + User.F_UserCode + ")" + "修改工单", 0, (int)EnumDisItemOpt.update, "", 0, User);
+                                }
+                                else return Error("修改失败");
                             }
-                            else return Error("修改失败");
+                            else return Error("不存在此部门信息！");
+                            //deptstr += sendeptid + ",";
                         }
-                        else return Error("不存在此部门信息！");
-                        //deptstr += sendeptid + ",";
+                        else return Error("配送信息不正确！");
                     }
-                    else return Error("配送信息不正确！");
-                }
-                //if (!string.IsNullOrEmpty(deptstr))
-                //    deptlist = deptstr.TrimEnd(',').Split(',');
-                #endregion
+                    //if (!string.IsNullOrEmpty(deptstr))
+                    //    deptlist = deptstr.TrimEnd(',').Split(',');
+                    #endregion
 
 
+                }
+                return Success("操作成功！");
             }
-            return Success("操作成功！");
+            return Error("无操作权限！");
         }
         /// <summary>
         /// 转派
         /// <returns></returns>
         public ActionResult AssignWo(int woid, string transMestr)
         {
-            string usercode = "8001";
             string transperson = "";
             string transcodestr = "";
-            var ua = userbll.GetModel(usercode);
             if (woid == 0)
                 return Error("工单编号错误！");
             var omodel = orderbll.GetModel(woid);
                     {
                         try { name = userbll.GetModel(code).F_UserName; }
                         catch { return Error("转运人信息不正确"); }
-                        bool n = AssignTrans(ua, omodel, "", code, phon, talkie);
+                        bool n = AssignTrans(User, omodel, "", code, phon, talkie);
                         if (n)
                         {
                             transperson = string.IsNullOrEmpty(transperson) ? name + "(" + code + ")" : transperson + "," + name + "(" + code + ")";
                     }
                     else return Error("转运人编号和手机号不能为空！");
                 }
-                omodel.F_ControlManCode = ua.F_UserCode;//调度人
-                omodel.F_ControlManName = ua.F_UserName;
+                omodel.F_ControlManCode = User.F_UserCode;//调度人
+                omodel.F_ControlManName = User.F_UserName;
                 omodel.F_TransPersonCode = transcodestr;//转派人编码字符串
                 omodel.F_TransPerson = transperson;
                 omodel.F_State = (int)EnumDisWorkOrderState.assign;//已指派待查收
         /// <returns></returns>
         public ActionResult SureWo(int woid)
         {
-            string uacode = "6001";
-            int state = 0;
-            var ua = userbll.GetModel(uacode);
             if (woid == 0)
                 return Error("工单编号错误！");
             var omodel = orderbll.GetModel(woid);
             if (omodel != null)
             {
-                if (DealWO(ua, omodel, "", "", 1))
+                if (DealWO(User, omodel, "", "", 1))
                     return Success("操作成功，请尽快处理工单！");
                 else return Error("工单操作失败！");
             }
         /// <param name="woid"></param>
         /// <returns></returns>
         public ActionResult DealWork(int woid)
-        {
-            string uacode = "6002";
-            var ua = userbll.GetModel(uacode);
+        {          
             if (woid == 0)
                 return Error("工单编号错误！");
             var omodel = orderbll.GetModel(woid);
             if (omodel != null)
             {
-                if (DealWO(ua, omodel, "", "", 2))
+                if (DealWO(User, omodel, "", "", 2))
                     return Success("操作成功，请尽快完成工单！");
                 else return Error("工单操作失败！");
             }
         /// <returns></returns>
         public ActionResult FeachRed(int woid)
         {
-            string uacode = "6001";
-            var ua = userbll.GetModel(uacode);
             if (woid == 0)
                 return Error("工单编号错误！");
             var omodel = orderbll.GetModel(woid);
             if (omodel != null)
             {
-                if (DealWO(ua, omodel, "", "", 4))
+                if (DealWO(User, omodel, "", "", 4))
                     return Success("操作成功！");
                 else return Error("工单操作失败！");
             }
         /// <returns></returns>
         public ActionResult FeachDrug(int woid)
         {
-            string uacode = "6001";
-            var ua = userbll.GetModel(uacode);
             if (woid == 0)
                 return Error("工单编号错误！");
             var omodel = orderbll.GetModel(woid);
             if (omodel != null)
             {
-                if (DealWO(ua, omodel, "", "", 5))
+                if (DealWO(User, omodel, "", "", 5))
                     return Success("操作成功！");
                 else return Error("工单操作失败！");
             }
         /// <param name="woid"></param>
         /// <returns></returns>
         public ActionResult TakeBlood(int woid)
-        {
-            string uacode = "6001";
-            var ua = userbll.GetModel(uacode);
+        {           
             if (woid == 0)
                 return Error("工单编号错误！");
             var omodel = orderbll.GetModel(woid);
             if (omodel != null)
             {
-                if (DealWO(ua, omodel, "", "", 6))
+                if (DealWO(User, omodel, "", "", 6))
                     return Success("操作成功！");
                 else return Error("工单操作失败！");
             }
         /// <param name="woid"></param>
         /// <returns></returns>
         public ActionResult SendTo(int woid)
-        {
-            string uacode = "6001";
-            var ua = userbll.GetModel(uacode);
+        {          
             if (woid == 0)
                 return Error("工单编号错误！");
             var omodel = orderbll.GetModel(woid);
             if (omodel != null)
             {
-                if (DealWO(ua, omodel, "", "", 7))
+                if (DealWO(User, omodel, "", "", 7))
                     return Success("操作成功！");
                 else return Error("工单操作失败！");
             }
         /// <returns></returns>
         public ActionResult ServiceWo(int woid)
         {
-            string uacode = "6001";
-            var ua = userbll.GetModel(uacode);
             if (woid == 0)
                 return Error("工单编号错误！");
             var omodel = orderbll.GetModel(woid);
             if (omodel != null)
             {
-                if (DealWO(ua, omodel, "", "", 3))
+                if (DealWO(User, omodel, "", "", 3))
                     return Success("操作成功!");
                 else return Error("工单操作失败！");
             }
         /// <returns></returns>
         public ActionResult OverWo(int woid, string sureman, string phon, string talkie)
         {
-            string usercode = "6004";
-            var ua = userbll.GetModel(usercode);
             if (woid == 0)
                 return Error("工单编号错误！");
             if (string.IsNullOrEmpty(sureman))
             var omodel = orderbll.GetModel(woid);
             if (omodel != null)
             {
-                if (omodel.F_CreateCode != usercode)
+                if (omodel.F_CreateCode != User.F_UserCode)
                     return Error("无操作权限！");
-                var n = AddLogTrans(woid, (int)omodel.F_State,(int)omodel.F_Type, user.F_UserName + "(" + user.F_UserCode + ")" + "确认完结工单", (int)EnumDisItemType.deal, (int)EnumDisItemOpt.over, "", "", phon, talkie, 0, ua);
+                var n = AddLogTrans(woid, (int)omodel.F_State,(int)omodel.F_Type, user.F_UserName + "(" + user.F_UserCode + ")" + "确认完结工单", (int)EnumDisItemType.deal, (int)EnumDisItemOpt.over, "", "", phon, talkie, 0, User);
                 //if (DealWO(ua, omodel, "", "", 6))
                 if (n > 0)
                 {