咨询

RMYY_CallCenter_Api.Dal/T_Wo_CommonBase.cs

@@ -24,9 +24,9 @@ namespace RMYY_CallCenter_Api.DAL
 		{
 			StringBuilder strSql=new StringBuilder();
 			strSql.Append("insert into T_Wo_CommonBase(");
-			strSql.Append("F_WoCode,F_CreateUser,F_Type,F_SonType,F_Content,F_Proposer,F_ProposerDept,F_DealUser,F_DealDept,F_TimeLimit,F_Status,F_IsDone,F_InternalWorkOrderCode,F_ExternalWorkOrderCode,F_CreateTime,F_UpdateTime)");
+			strSql.Append("F_WoCode,F_CreateUser,F_Type,F_SonType,F_Content,F_Proposer,F_ProposerDept,F_DealUser,F_DealDept,F_TimeLimit,F_Status,F_IsDone,F_InternalWorkOrderCode,F_ExternalWorkOrderCode,F_CreateTime,F_UpdateTime,F_Phone)");
 			strSql.Append(" values (");
-			strSql.Append("@F_WoCode,@F_CreateUser,@F_Type,@F_SonType,@F_Content,@F_Proposer,@F_ProposerDept,@F_DealUser,@F_DealDept,@F_TimeLimit,@F_Status,@F_IsDone,@F_InternalWorkOrderCode,@F_ExternalWorkOrderCode,@F_CreateTime,@F_UpdateTime)");
+			strSql.Append("@F_WoCode,@F_CreateUser,@F_Type,@F_SonType,@F_Content,@F_Proposer,@F_ProposerDept,@F_DealUser,@F_DealDept,@F_TimeLimit,@F_Status,@F_IsDone,@F_InternalWorkOrderCode,@F_ExternalWorkOrderCode,@F_CreateTime,@F_UpdateTime,@F_Phone)");
 			SqlParameter[] parameters = {
 					new SqlParameter("@F_WoCode", SqlDbType.VarChar,50),
 					new SqlParameter("@F_CreateUser", SqlDbType.Int,4),
@@ -43,7 +43,9 @@ namespace RMYY_CallCenter_Api.DAL
 					new SqlParameter("@F_InternalWorkOrderCode", SqlDbType.VarChar,500),
 					new SqlParameter("@F_ExternalWorkOrderCode", SqlDbType.VarChar,500),
 					new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
-					new SqlParameter("@F_UpdateTime", SqlDbType.DateTime)};
+					new SqlParameter("@F_UpdateTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_Phone", SqlDbType.VarChar,50)
+            };
 			parameters[0].Value = model.F_WoCode;
 			parameters[1].Value = model.F_CreateUser;
 			parameters[2].Value = model.F_Type;
@@ -60,8 +62,10 @@ namespace RMYY_CallCenter_Api.DAL
 			parameters[13].Value = model.F_ExternalWorkOrderCode;
 			parameters[14].Value = model.F_CreateTime;
 			parameters[15].Value = model.F_UpdateTime;
+            parameters[16].Value = model.F_Phone;
+            
 
-			return DbHelperSQL.ExecuteSql(strSql.ToString(),parameters);
+            return DbHelperSQL.ExecuteSql(strSql.ToString(),parameters);
 		}
 	
 		/// <summary>
@@ -87,8 +91,11 @@ namespace RMYY_CallCenter_Api.DAL
 			strSql.Append("F_InternalWorkOrderCode=@F_InternalWorkOrderCode,");
 			strSql.Append("F_ExternalWorkOrderCode=@F_ExternalWorkOrderCode,");
 			strSql.Append("F_CreateTime=@F_CreateTime,");
-			strSql.Append("F_UpdateTime=@F_UpdateTime");
-			strSql.Append(" where ");
+			strSql.Append("F_UpdateTime=@F_UpdateTime,");
+            strSql.Append("F_Phone=@F_Phone");
+            
+
+            strSql.Append(" where ");
 			SqlParameter[] parameters = {
 					new SqlParameter("@F_WoCode", SqlDbType.VarChar,50),
 					new SqlParameter("@F_CreateUser", SqlDbType.Int,4),
@@ -106,7 +113,9 @@ namespace RMYY_CallCenter_Api.DAL
 					new SqlParameter("@F_InternalWorkOrderCode", SqlDbType.VarChar,500),
 					new SqlParameter("@F_ExternalWorkOrderCode", SqlDbType.VarChar,500),
 					new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
-					new SqlParameter("@F_UpdateTime", SqlDbType.DateTime)};
+					new SqlParameter("@F_UpdateTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_Phone", SqlDbType.VarChar,50)
+            };
 			parameters[0].Value = model.F_WoCode;
 			parameters[1].Value = model.F_CreateUser;
 			parameters[2].Value = model.F_Type;
@@ -123,7 +132,9 @@ namespace RMYY_CallCenter_Api.DAL
 			parameters[13].Value = model.F_ExternalWorkOrderCode;
 			parameters[14].Value = model.F_CreateTime;
 			parameters[15].Value = model.F_UpdateTime;
-			int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters);
+            parameters[16].Value = model.F_Phone;
+
+            int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters);
 			if (rows > 0)
 			{
 				return true;
@@ -165,7 +176,7 @@ namespace RMYY_CallCenter_Api.DAL
 		{
 			//该表无主键信息，请自定义主键/条件字段
 			StringBuilder strSql=new StringBuilder();
-			strSql.Append("select  top 1 F_WoCode,F_CreateUser,F_Type,F_SonType,F_Content,F_Proposer,F_ProposerDept,F_DealUser,F_DealDept,F_TimeLimit,F_Status,F_IsDelete,F_IsDone,F_InternalWorkOrderCode,F_ExternalWorkOrderCode,F_CreateTime,F_UpdateTime from T_Wo_CommonBase ");
+			strSql.Append("select  top 1 F_WoCode,F_CreateUser,F_Phone,F_Type,F_SonType,F_Content,F_Proposer,F_ProposerDept,F_DealUser,F_DealDept,F_TimeLimit,F_Status,F_IsDelete,F_IsDone,F_InternalWorkOrderCode,F_ExternalWorkOrderCode,F_CreateTime,F_UpdateTime from T_Wo_CommonBase ");
 			strSql.Append(" where ");
 			SqlParameter[] parameters = {
 };
@@ -188,7 +199,7 @@ namespace RMYY_CallCenter_Api.DAL
 		public DataSet GetList(string strWhere)
 		{
 			StringBuilder strSql=new StringBuilder();
-			strSql.Append("select F_WoCode,F_CreateUser,F_Type,F_SonType,F_Content,F_Proposer,F_ProposerDept,F_DealUser,F_DealDept,F_TimeLimit,F_Status,F_IsDelete,F_IsDone,F_InternalWorkOrderCode,F_ExternalWorkOrderCode,F_CreateTime,F_UpdateTime ");
+			strSql.Append("select F_WoCode,F_CreateUser,F_Type,F_Phone,F_SonType,F_Content,F_Proposer,F_ProposerDept,F_DealUser,F_DealDept,F_TimeLimit,F_Status,F_IsDelete,F_IsDone,F_InternalWorkOrderCode,F_ExternalWorkOrderCode,F_CreateTime,F_UpdateTime ");
 			strSql.Append(" FROM T_Wo_CommonBase ");
 			if(strWhere.Trim()!="")
 			{
@@ -208,7 +219,7 @@ namespace RMYY_CallCenter_Api.DAL
 			{
 				strSql.Append(" top "+Top.ToString());
 			}
-			strSql.Append(" F_WoCode,F_CreateUser,F_Type,F_SonType,F_Content,F_Proposer,F_ProposerDept,F_DealUser,F_DealDept,F_TimeLimit,F_Status,F_IsDelete,F_IsDone,F_InternalWorkOrderCode,F_ExternalWorkOrderCode,F_CreateTime,F_UpdateTime ");
+			strSql.Append(" F_WoCode,F_CreateUser,F_Type,F_SonType,F_Phone,F_Content,F_Proposer,F_ProposerDept,F_DealUser,F_DealDept,F_TimeLimit,F_Status,F_IsDelete,F_IsDone,F_InternalWorkOrderCode,F_ExternalWorkOrderCode,F_CreateTime,F_UpdateTime ");
 			strSql.Append(" FROM T_Wo_CommonBase ");
 			if(strWhere.Trim()!="")
 			{
@@ -312,7 +323,11 @@ namespace RMYY_CallCenter_Api.DAL
 				{
 					model.F_UpdateTime=DateTime.Parse(dr["F_UpdateTime"].ToString());
 				}
-				return model;
+                if (dr["F_Phone"].ToString() != "")
+                {
+                    model.F_Phone = dr["F_Phone"].ToString();
+                }
+                return model;
 			}
 			else
 			{

RMYY_CallCenter_Api.Model/T_Con_WorkOrder.cs

@@ -520,6 +520,26 @@ namespace RMYY_CallCenter_Api.Model
             set { _f_inpatientnum = value; }
             get { return _f_inpatientnum; }
         }
+        /// <summary>
+        /// 与患者关系
+        /// </summary>
+        public string F_Relationship { set; get; }
+        /// <summary>
+        /// 患者姓名
+        /// </summary>
+        public string F_FullName { set; get; }
+        /// <summary>
+        /// 患者身份证号
+        /// </summary>
+        public string F_IDNumber { set; get; }
+        /// <summary>
+        /// 投诉部门
+        /// </summary>
+        public int ? F_ComplaintDept { set; get; }
+        /// <summary>
+        /// 投诉人
+        /// </summary>
+        public string F_ComplaintUser { set; get; }
         #endregion Model
 
         #region 扩展

RMYY_CallCenter_Api.Model/T_Wo_CommonBase.cs

@@ -156,8 +156,10 @@ namespace RMYY_CallCenter_Api.Model
 			set{ _f_updatetime=value;}
 			get{return _f_updatetime;}
 		}
-		#endregion Model
 
-	}
+        public string F_Phone { set; get; }
+        #endregion Model
+
+    }
 }
 

RMYY_CallCenter_Api/Common/WorkOrderBase.cs

@@ -416,7 +416,7 @@ namespace RMYY_CallCenter_Api
             }
             else if (type == 1000)
             {
-                typeIdArray = new List<int> { 0, 1, 2, -1, -1, 10, -1, -1, -1, -1, -1 };
+                typeIdArray = new List<int> { 0, 1, 2, -1, -1, 10, -1, -1,3,4 };
             }
             else 
             {
@@ -434,9 +434,9 @@ namespace RMYY_CallCenter_Api
             switch (menuName)
             {
                 case MENUENUM.我的提交:
-                    strArr = new List<string> { "待提交", "待接单", "待接单", "已接单", "待评价", "已完成", "已完成","已接单" }; break;
+                    strArr = new List<string> { "待提交", "待接单", "待接单", "已接单", "待评价", "已完成", "已完成","已接单","已退回","办理中" }; break;
                 case MENUENUM.工单列表:
-                    strArr = new List<string> { "待提交", "待派工", "待接单", "待完成", "已处理", "异常完成", "已完成", "已接单" }; break;
+                    strArr = new List<string> { "待提交", "待派工", "待接单", "待完成", "已处理", "异常完成", "已完成", "已接单", "已退回", "办理中" }; break;
                 case MENUENUM.报修列表:
                     strArr = new List<string> { "待提交", "-", "待接单", "待完成", "已完成", "已完成", "已完成", "已接单" }; break;
                 default: break;

RMYY_CallCenter_Api/Common/WorkOrderButton.cs

@@ -16,7 +16,7 @@ namespace RMYY_CallCenter_Api
         public static List<Button> GetButtons(MENUENUM menuName, int type, int status, int roleId = 0, int assistanceState = 0)
         {
             var desc = menuName.GetType().GetMember(menuName.ToString())[0].GetCustomAttributes(typeof(DescriptionAttribute), false);
-            if (desc == null || desc.Length != 1)
+            if (desc == null || desc.Length == 2)
             {
                 return null;
             }

RMYY_CallCenter_Api/Controllers/DictionaryType/GongDanTypeController.cs

@@ -7,6 +7,7 @@ using System.Text;
 using System.Web;
 using System.Web.Mvc;
 using CallCenterApi.Interface.Models;
+using RMYY_CallCenter_Api.DB;
 using RMYY_CallCenter_Api.Model;
 using RMYY_CallCenter_Api.Models;
 using RMYY_CallCenter_Api.Utility;
@@ -79,6 +80,11 @@ namespace RMYY_CallCenter_Api.Controllers
             model.F_ParentID = input.F_ParentID;
             model.F_CreateTime = DateTime.Now;
             model.F_TypeId = input.F_TypeId;
+            if (!string .IsNullOrEmpty (input.F_Identification))
+            {
+                if (GetIdentification(input.F_Identification) > 0)
+                    return Error("该标识已存在");
+            }
             model.F_Identification = input.F_Identification;
             if (gongdanBll.Add(model) > 0)
             {
@@ -89,7 +95,14 @@ namespace RMYY_CallCenter_Api.Controllers
                 return Error("添加失败，请重试");
             }
         }
-
+        public int GetIdentification(string Identification)
+        {
+            if (string.IsNullOrEmpty(Identification))
+                return 0;
+            var sql = "F_Identification='" + Identification + "'  ";
+            var count = DbHelperSQL.Query("select count(1)  from T_Sys_GongDan where " + sql).ToString ();
+            return int.Parse(count);
+        }
         /// <summary>
         /// 获取实体
         /// </summary>
@@ -175,6 +188,11 @@ namespace RMYY_CallCenter_Api.Controllers
                 ModuleInfo.F_Sort = input.F_Sort;
                 ModuleInfo.F_TypeId = input.F_TypeId;
                 ModuleInfo.F_TimeOut = input.F_TimeOut;
+                if (!string.IsNullOrEmpty(input.F_Identification))
+                {
+                    if (GetIdentification(input.F_Identification) > 0&& input.F_Identification!= ModuleInfo.F_Identification)
+                        return Error("该标识已存在");
+                }
                 ModuleInfo.F_Identification = input.F_Identification;
                 ModuleInfo.F_RepairTimeLimit = input.F_RepairTimeLimit;
                 if (gongdanBll.Update(ModuleInfo))

RMYY_CallCenter_Api/Controllers/IndexController.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Web;
 using System.Web.Mvc;
 
@@ -797,6 +798,58 @@ namespace RMYY_CallCenter_Api.Controllers
         }
 
         #endregion
+        /// <summary>
+        /// 获取24小时话务受理量
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetHWCount24ByNow(string datetime)
+        {
+            var date = DateTime.Now;
+            if (!string .IsNullOrEmpty (datetime))
+            {
+                date = DateTime.Parse(datetime);
+            }
+            var hr =24;
+            int[] hours = Enumerable.Range(0, hr).ToArray<int>();
+            var obj = new
+            {
+                hours,
+                hwcount = new List<int[]>(),
+                jtcount = new List<int[]>()
+            };
 
+            if (RedisHelper.StringGet("GetHWCount24ByNow" + date.ToString("yyyy-MM-dd")) != null)
+            {
+                return Content(RedisHelper.StringGet("GetHWCount24ByNow" + date.ToString("yyyy-MM-dd")).ToString());
+            }
+            else
+            {
+                string sql = $"   and datediff(day, BeginTime, '{date.ToString("yyyy-MM-dd")}') = 0  ";
+                string sqlhw = " select datepart(hh, BeginTime ) hour,SUM(case CallState when 1 then 1 else 0 end ) jietong ,count(1) count from T_Call_CallRecords where  1=1" + sql + " group by datepart(hh, BeginTime) order by datepart(hh, BeginTime)";
+                DataTable dthw = DbHelperSQL.Query(sqlhw).Tables[0];
+
+                int[] hwc = new int[hours.Length]; int[] jcc = new int[hours.Length];
+                for (int i = 0; i < hours.Length; i++)
+                {
+                    var drs = dthw.Select("hour='" + hours[i] + "'");
+                    int hw = 0; int jt = 0;
+                    if (drs.Length > 0)
+                    {
+                        hw = (from DataRow dr in drs select dr.Field<int>("count")).FirstOrDefault();
+                        jt = (from DataRow dr in drs select dr.Field<int>("jietong")).FirstOrDefault();
+                    }
+                    jcc[i] = jt;
+                    hwc[i] = hw;
+                }
+                obj.jtcount.Add(jcc);
+                obj.hwcount.Add(hwc);
+                RedisHelper.StringSet("GetHWCount24ByNow" + date.ToString("yyyy-MM-dd"), obj.ToJson(), new TimeSpan(0, 10, 0));
+                return Content(obj .ToJson ());
+            }
+
+           
+
+          
+        }
     }
 }

RMYY_CallCenter_Api/Controllers/WorkOrder/Con_WorkOrderController.cs

@@ -36,11 +36,16 @@ namespace RMYY_CallCenter_Api.Controllers
                 {
                     case 0:
                         //基本信息
-                        string sql = "select *,[dbo].[GetUserName](F_CreateUser) F_CreateUserName,[dbo].[GetUserName](F_HandleBy) F_DealUserName from T_Con_WorkOrder where F_WorkOrderCode='" + strworkorderid + "'";
+                        string sql = "select *, dbo.GetDepName(F_ComplaintDept) ComplaintDept,[dbo].[GetUserName](F_CreateUser) F_CreateUserName,[dbo].[GetUserName](F_HandleBy) F_DealUserName " +
+                            "  from T_Con_WorkOrder where F_WorkOrderCode='" + strworkorderid + "'";
                         DataTable dtbase = DbHelperSQL.Query(sql).Tables[0];
                        
                         dtbase.Columns.Add("StateName");
                         dtbase.Columns.Add("TypeName");
+                        dtbase.Columns.Add("DealDept");
+                        dtbase.Columns.Add("DealUser");
+                        dtbase.Columns.Add("DealDeptName");
+                        dtbase.Columns.Add("DealUserName");
 
                         foreach (DataRow dr in dtbase.Rows)
                         {
@@ -68,8 +73,31 @@ namespace RMYY_CallCenter_Api.Controllers
                             }
 
                         }
+                        string Wosql = "select *, dbo.GetDepName(F_DealDept) DealDept,[dbo].[GetUserNameByUserId](F_DealUser) UserName" +
+                           "  from T_Wo_CommonBase where F_WoCode='" + strworkorderid + "'";
+                        DataTable wodtbase = DbHelperSQL.Query(Wosql).Tables[0];
+                        if (wodtbase.Rows != null && wodtbase.Rows .Count >0)
+                        {
+                            dtbase.Rows[0]["DealDept"] = wodtbase.Rows[0]["F_DealDept"].ToString();
+                            dtbase.Rows[0]["DealUser"] = wodtbase.Rows[0]["F_DealUser"].ToString();
+                            dtbase.Rows[0]["DealDeptName"] = wodtbase.Rows[0]["DealDept"].ToString();
+                            dtbase.Rows[0]["DealUserName"] = wodtbase.Rows[0]["UserName"].ToString();
+                            
+                        }
+                     
 
+                        var CommonBase = new BLL.T_Wo_CommonBase().GetModelList($"F_WoCode='{dtbase.Rows[0]["F_WorkOrderCode"].ToString () }' and F_IsDelete=0");
                         return Success("获取成功", dtbase);
+                      
+                    case 1://工单流程
+                        var sqllog = "select * from T_Dis_WorkOrderItem where F_WoID = '" + model.F_ID  + "' " + " order by F_ID desc";
+
+                        DataTable dtlog = DbHelperSQL.Query(sqllog).Tables[0];
+                        return Success("获取成功", dtlog);
+                       
+                      
+
+                        
                   
                 }
 
@@ -230,9 +258,13 @@ namespace RMYY_CallCenter_Api.Controllers
                                   F_DealContents=p.F_DealContents,
                                   F_File=p.F_File,
                                   F_Satisfaction=p.F_Satisfaction,
-                                  F_State=p.F_State
-
-                              }),
+                                  F_State=p.F_State,
+                                  F_Relationship=p.F_Relationship,
+                                  F_FullName = p.F_FullName,
+                                  F_IDNumber = p.F_IDNumber,
+                                  F_ComplaintDept = p.F_ComplaintDept,
+                                  F_ComplaintUser = p.F_ComplaintUser,
+                                }),
                         total = recordCount
                     };
                     return Content(obj.ToJson());
@@ -387,7 +419,7 @@ namespace RMYY_CallCenter_Api.Controllers
         /// 添加工单
         /// </summary>
         /// <returns></returns>
-        public ActionResult AddWorkOrder(Con_WorkOrderInput input, int overtime = 0, int opt = 0, string cont = "")
+        public ActionResult AddWorkOrder(Con_WorkOrderInput input, int overtime = 0, int opt = 0, string cont = "",string  clid="",int clbm=0)
         {
 
             if (User != null)
@@ -474,17 +506,12 @@ namespace RMYY_CallCenter_Api.Controllers
                         }
                         else if (opt == 3)//转派
                         {
-                            if (input.F_Type2 == 1004 || input.F_Type2 == 1005)//家庭预约,静脉置管维护 立即处理并给健康事业部或置管室 推送一条钉钉消息
+                            bool tt = AssignWO(User, work, cont, clid, clbm);
+                            if (tt)
                             {
-                                int clbm = 0;//健康事业部的部门Id
-                                bool tt = DealWO(User, work, cont, "", 1);
-                                if (tt)
-                                {
-                                    #region  给健康事业部或 置管室 推送一条钉钉消息
-                                    #endregion
-                                }
+                                #region  给健康事业部或 置管室 推送一条钉钉消息
+                                #endregion
                             }
-                            else return Error("此工单类型不支持转派！");
                         }
 
                     }
@@ -505,7 +532,7 @@ namespace RMYY_CallCenter_Api.Controllers
         /// <param name="opt"></param>
         /// <param name="cont"></param>
         /// <returns></returns>
-        public ActionResult UpdateWorkOrder(Con_WorkOrderInput input, int opt = 0, string cont = "")
+        public ActionResult UpdateWorkOrder(Con_WorkOrderInput input, int opt = 0, string cont = "", string  clid = "", int clbm = 0)
         {
             if (User != null)
             {
@@ -537,7 +564,7 @@ namespace RMYY_CallCenter_Api.Controllers
                     return Error("查询不到此工单！");
                 if (User.F_UserCode != "8000")
                 {
-                    if (model.F_CreateUserID != User.F_UserCode)
+                    if (model.F_CreateUser != User.F_UserCode )
                         return Error("非创建人不能修改工单！");
                     if (model.F_State == (int)EnumWorkOrderState.assign)
                         return Error("此工单已派单不能修改！");
@@ -595,18 +622,12 @@ namespace RMYY_CallCenter_Api.Controllers
                         }
                         else if (opt == 3)//转派
                         {
-                            if (input.F_Type2 == 1004 || input.F_Type2 == 1005)//家庭预约,静脉置管维护 立即处理并给健康事业部或置管室 推送一条钉钉消息
+                            bool tt = AssignWO(User, model, cont, clid , clbm );
+                            if (tt)
                             {
-                                int clbm = 0;//健康事业部的部门Id
-                                bool tt = DealWO(User, model, cont, "", 1);
-                                if (tt)
-                                {
-                                    #region  给健康事业部或 置管室 推送一条钉钉消息
-                                    #endregion
-                                }                              
-
+                                #region  给健康事业部或 置管室 推送一条钉钉消息
+                                #endregion
                             }
-                            else return Error("此工单类型不支持转派！");
                         }
 
                     }
@@ -719,12 +740,15 @@ namespace RMYY_CallCenter_Api.Controllers
             model.F_Phon = input.F_Phon;//来电人电话
             model.F_CusAddress = input.F_CusAddress;//地址
             model.F_IdCard = input.F_IdCard;//身份证号
-            if (input.F_Type2 == 1004)
-            {
-                model.F_ServiceItems = input.F_ServiceItems;//服务项目
-            }
-            if (input.F_Type2 == 1003)
-            {
+           
+                 model.F_Relationship = input.F_Relationship;
+            model.F_FullName = input.F_FullName;
+            model.F_IDNumber = input.F_IDNumber;
+            model.F_ComplaintDept = input.F_ComplaintDept;
+            model.F_ComplaintUser = input.F_ComplaintUser;
+            model.F_ServiceItems = input.F_ServiceItems;//服务项目
+            
+        
                 model.F_Address = input.F_Address;//地区
                 model.F_FirstCheckHospital = input.F_FirstCheckHospital;//首次检查医院
                 model.F_NoduleSize = input.F_NoduleSize;//肺结节大小
@@ -733,15 +757,13 @@ namespace RMYY_CallCenter_Api.Controllers
                     model.F_Urgency = input.F_Urgency;// 紧急程度:0,常规1，紧急
                 else
                     model.F_Urgency = model.F_Urgency;
-            }
-            if (input.F_Type2 == 1005)
-            {
-                model.F_Cathetertype = input.F_Cathetertype;//  
+            
+             model.F_Cathetertype = input.F_Cathetertype;//  
                 model.F_Catheterdept = input.F_Catheterdept;//置管科室
                 model.F_Cathetertime = input.F_Cathetertime;//置管时间
                 model.F_BedNum = input.F_BedNum;//床号
                 model.F_InpatientNum = input.F_InpatientNum;//住院号
-            }
+            
 
             //model.F_DealType = input.F_DealType;//处理方式：立即办理，提交审核，转派部门
             model.F_WorkOrderContents = input.F_WorkOrderContents;//工单内容
@@ -977,7 +999,11 @@ namespace RMYY_CallCenter_Api.Controllers
                     Inputmodel.F_DealContents = item.F_DealContents;//处理内容
                     Inputmodel.F_File = "0";
                     Inputmodel.F_Satisfaction = item.F_Satisfaction;//满意度
-
+                    Inputmodel.F_FullName = item.F_FullName;
+                    Inputmodel.F_IDNumber = item.F_IDNumber;
+                    Inputmodel.F_ComplaintDept = item.F_ComplaintDept;
+                    Inputmodel.F_ComplaintUser = item.F_ComplaintUser;
+                    Inputmodel.ComplaintDept = GetDeptModel(item.F_ComplaintDept == null ? 0 : item.F_ComplaintDept);
                     Inputlist.Add(Inputmodel);
                 }
                 return Inputlist;
@@ -988,16 +1014,16 @@ namespace RMYY_CallCenter_Api.Controllers
         /// 转派工单
         /// </summary>
 
-        private bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Con_WorkOrder wokerModel, string cont, int clid = 0, int clbm = 0)
+        private bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Con_WorkOrder wokerModel, string cont, string clid = "", int clbm = 0)
         {
 
             string touser = ""; string tousername = "";
-            int deptid = 0;
+            int deptid = 0;int handle = 0;
             #region 获取接收人
-            if (clid != 0)
+            if (!string .IsNullOrEmpty (clid))
             {
                 Model.T_Sys_UserAccount clus = userbll.GetModel(clid);
-
+                handle = clus.F_UserId;
                 deptid = clus.F_DeptId;
                 clbm = clus.F_DeptId;
                 if (clus != null)
@@ -1034,7 +1060,7 @@ namespace RMYY_CallCenter_Api.Controllers
                 #region 工单处理
                 var opt = "指派";
                 int optbut = (int)EnumItemOpt.assign;
-                int wostate = (int)EnumWorkOrderState.assign;//已指派待处理
+                int wostate = (int)EnumWorkOrderState.assign;//已指派待接单
                 string deptname = "";
                 var deptmodel = deptbll.GetModel(nowUser.F_DeptId);
                 if (deptmodel != null)
@@ -1046,6 +1072,7 @@ namespace RMYY_CallCenter_Api.Controllers
                     optcont = "，说明：" + cont;
                 var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单给 " + tousername + optcont;
                 var itemid =logbll.AddLog(wokerModel.F_ID, wostate,(int)wokerModel.F_type1, content, (int)EnumItemType.deal, optbut, touser, clbm, nowUser.F_UserCode);
+                int n = DbHelperSQL.ExecuteSql($"update T_Wo_CommonBase set F_DealDept='{clbm}',F_DealUser='{handle}' where F_WoCode='{wokerModel.F_WorkOrderCode}'");
                 #endregion
                 if (itemid > 0)
                 {
@@ -1091,7 +1118,7 @@ namespace RMYY_CallCenter_Api.Controllers
                         if (AuditState == 1)
                         {
                             res =logbll.AddLog(wmodel.F_ID, wmodel.F_State.Value,(int)wmodel.F_type1, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "工单审批：已同意审批" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, ua.F_UserCode, ua.F_DeptId, ua.F_UserCode);
-                            AssignWO(User, wmodel, "", 0, (int)clbm);
+                            AssignWO(User, wmodel, "", "", (int)clbm);
                             wmodel.F_State = (int)EnumWorkOrderState.assign;//待处理
                             wmodel.F_AuditState = 1;
                         }
@@ -1129,14 +1156,14 @@ namespace RMYY_CallCenter_Api.Controllers
         /// <param name="F_Files"></param>
         /// <param name="isover"></param>
         /// <returns></returns>
-        public ActionResult DealWorkOrder(int id,string cont)
+        public ActionResult DealWorkOrder(string WorkOrderCode, string cont, int isover=0)
         {
             if (User!=null)
             {
                 if (string.IsNullOrEmpty(cont))
                     return Error("请输入内容");
  
-                    Model.T_Con_WorkOrder wmodel = orderbll.GetModel(id);
+                    Model.T_Con_WorkOrder wmodel = orderbll.GetModelByCode(WorkOrderCode);
                     if (wmodel != null)
                     {
                         if (wmodel.F_State == 10)
@@ -1217,6 +1244,10 @@ namespace RMYY_CallCenter_Api.Controllers
                 return false;
             #endregion
         }
+
+       
+
+
         #region  nouser
         ///// <summary>
         ///// 转派工单
@@ -1290,78 +1321,86 @@ namespace RMYY_CallCenter_Api.Controllers
         /// <summary>
         /// 接单 - 确认工单
         /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        //public ActionResult SureWorkOrder(int id)
-        //{
-        //    if (User != null)
-        //    {
+        /// <param name = "id" ></ param >
+        /// < returns ></ returns >
+        public ActionResult SureWorkOrder(string WorkOrderCode)
+        {
+            if (User != null)
+            {
 
-        //        Model.T_Con_WorkOrder wmodel = orderbll.GetModel(id);
-        //        if (wmodel != null)
-        //        {
-        //            //var modellist=itembll.GetModelList("F_WoID=" + wmodel.F_ID + "and F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
-        //            //   if (!string.IsNullOrEmpty(modellist.F_NextUser))
-        //            //   {
-        //            //       string[] str = modellist.F_NextUser.Split(',');
-        //            //       if (str.Length == 1)
-        //            //       {
-        //            //           if (modellist.F_NextUser != ua.F_UserCode)
-        //            //               return Error("非接单人不可操作工单");
-        //            //       }
-        //            //   }
-        //            if (wmodel.F_State == (int)EnumWorkOrderState.receive)
-        //                return Error("工单已接单无需重复操作");
-        //            else
-        //            {
-        //                var res = OrdeReceive(User, wmodel);
-        //                if (res)
-        //                    return Success("接单成功");
-        //                else
-        //                    return Error("接单失败");
-        //            }
-        //        }
-        //        else
-        //            return Error("工单不存在");
-        //    }
-        //    return Error("无操作权限！");
-        //}
+                Model.T_Con_WorkOrder wmodel = orderbll.GetModelByCode(WorkOrderCode);
+                if (wmodel != null)
+                {
+                    if (wmodel.F_State != (int)EnumWorkOrderState.receive)
+                        return Error("工单已接单无需重复操作");
+                    var Common = new Model.T_Wo_CommonBase();
+                    var CommonBase = new BLL.T_Wo_CommonBase().GetModelList($"F_WoCode='{wmodel.F_WorkOrderCode }' and F_IsDelete=0");
+                    if (CommonBase != null && CommonBase.Count > 0)
+                    {
+                        Common = CommonBase.FirstOrDefault();
+                      if (Common.F_DealUser !=null&& Common.F_DealUser>0)
+                        {
+                            if (Common.F_DealUser != User.F_UserId)
+                                return Error("非接单人不可接单");
+                        }
+                        else if (Common.F_DealDept  != null && Common.F_DealDept > 0)
+                        {
+                            if (Common.F_DealDept != User.F_DeptId )
+                                return Error("非接单部门不可接单");
+
+                        }
+                       
+                    }
+
+                    var res = OrdeReceive(User, wmodel, Common);
+                    if (res)
+                        return Success("接单成功");
+                    else
+                        return Error("接单失败");
+
+                   
+                }
+                else
+                    return Error("工单不存在");
+            }
+            return Error("无操作权限！");
+        }
         /// <summary>
         /// 接单
         /// </summary>
-        /// <param name="nowUser"></param>
-        /// <param name="model"></param>
+        /// <param name = "nowUser" ></ param >
+        /// < param name="model"></param>
         /// <returns></returns>
-        //public bool OrdeReceive(Model.T_Sys_UserAccount nowUser, Model.T_Con_WorkOrder model)
-        //{
-        //    #region 工单处理
-        //    var opt = "接单";
-        //    int optbut = (int)EnumItemOpt.receive;
-        //    int wostate = (int)EnumWorkOrderState.receive;
-
-        //    #region 读取当前登录人部门
-        //    string deptname = "";
-        //    var deptmodel =deptbll.GetModel(nowUser.F_DeptId);
-        //    if (deptmodel != null)
-        //    {
-        //        deptname = deptmodel.F_DeptName + "-";
-        //    }
-        //    #endregion
-        //    var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt;
-        //    var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser);
-        //    if (itemid > 0)
-        //    {
-        //        #region 处理工单
-        //        model.F_State = wostate;//已接单待处理
-        //        model.F_HandleBy = nowUser.F_UserCode;//已接单待处理
-        //        orderbll.Update(model);
-        //        #endregion
-        //        return true;
-        //        }
-        //        else
-        //            return false;
-        //    #endregion
-        //}
+        public bool OrdeReceive(Model.T_Sys_UserAccount nowUser, Model.T_Con_WorkOrder model,Model .T_Wo_CommonBase CommonBase)
+        {
+            #region 工单处理
+            var opt = "接单";
+            int optbut = (int)EnumItemOpt.receive;
+            int wostate = (int)EnumWorkOrderState.receive;
+
+            #region 读取当前登录人部门
+            string deptname = "";
+            var deptmodel = deptbll.GetModel(nowUser.F_DeptId);
+            if (deptmodel != null)
+            {
+                deptname = deptmodel.F_DeptName + "-";
+            }
+            #endregion
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt;
+            var itemid = logbll.AddLog((int)model.F_ID, (int)model.F_type1, wostate, content, (int)EnumItemType.deal, optbut, nowUser.F_UserCode, 0, nowUser.F_UserCode);
+            if (itemid > 0)
+            {
+                #region 处理工单
+                model.F_State = wostate;//已接单待处理
+                model.F_HandleBy = nowUser.F_UserCode;//已接单待处理
+                orderbll.Update(model);
+                #endregion
+                return true;
+            }
+            else
+                return false;
+            #endregion
+        }
         #endregion nouser  nouser
 
         /// <summary>
@@ -1386,7 +1425,102 @@ namespace RMYY_CallCenter_Api.Controllers
             return Error("操作失败,不存在此工单编号！");
         }
 
+        public string GetDeptModel(int?  deptId = 0)
+        {
+            string sql = " 1=1 ";
+
+            if (deptId>0)
+            {
+                sql += " and F_DeptId='" + deptId + "'";
+            }
+            else
+            {
+                return "";
+            }
+            var role = new Bll .T_Sys_Department ().GetModelList(sql).FirstOrDefault();
+            string name = role.F_DeptName;
+
+            return name;
+        }
+        /// <summary>
+        /// 退回工单
+        /// </summary>
+        /// <param name="WorkOrderCode"></param>
+        /// <returns></returns>
+        public ActionResult BackWorkOrder(string WorkOrderCode   )
+        {
+            if (User != null)
+            {
+
+                Model.T_Con_WorkOrder wmodel = orderbll.GetModelByCode (WorkOrderCode);
+                if (wmodel != null)
+                {
+                    if (wmodel.F_State != (int)EnumWorkOrderState.assign)
+                        return Error("工单已接单不能退回");
+                    var Common = new Model.T_Wo_CommonBase();
+                    var CommonBase = new BLL.T_Wo_CommonBase().GetModelList($"F_WoCode='{wmodel.F_WorkOrderCode }' and F_IsDelete=0");
+                    if (CommonBase != null && CommonBase.Count > 0)
+                    {
+                        Common = CommonBase.FirstOrDefault();
+                        if (Common.F_DealUser != null && Common.F_DealUser > 0)
+                        {
+                            if (Common.F_DealUser != User.F_UserId)
+                                return Error("非接单人不可退单");
+                        }
+                        else if (Common.F_DealDept != null && Common.F_DealDept > 0)
+                        {
+                            if (Common.F_DealDept != User.F_DeptId)
+                                return Error("非接单部门不可退单");
+
+                        }
+
+                    }
+
+                    var res = BackWO(User, wmodel);
+                    if (res)
+                        return Success("退单成功");
+                    else
+                        return Error("退单失败");
+
 
+                }
+                else
+                    return Error("工单不存在");
+            }
+            return Error("无操作权限！");
+        }
+        /// <summary>
+        /// 退回工单
+        /// </summary>
+        public bool BackWO(Model.T_Sys_UserAccount nowUser, Model.T_Con_WorkOrder model)
+        {
+            #region 工单处理
+            var opt = "接单";
+            int optbut = (int)EnumItemOpt.reback;
+            int wostate = (int)EnumWorkOrderState.reback;
+
+            #region 读取当前登录人部门
+            string deptname = "";
+            var deptmodel = deptbll.GetModel(nowUser.F_DeptId);
+            if (deptmodel != null)
+            {
+                deptname = deptmodel.F_DeptName + "-";
+            }
+            #endregion
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt;
+            var itemid = logbll.AddLog((int)model.F_ID, (int)model.F_type1, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser.F_UserCode);
+            if (itemid > 0)
+            {
+                #region 处理工单
+                model.F_State = wostate;//已退回
+                orderbll.Update(model);
+                #endregion
+                return true;
+            }
+            else
+                return false;
+            #endregion
+        }
         private class ItemListLog
         {
             /// <summary>

RMYY_CallCenter_Api/Controllers/WorkOrder/WorkCommonController.cs

@@ -29,7 +29,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             if (User != null)
             {
                 int recordCount = 0;
-                string sql = $" and F_ProposerDept='{User.F_DeptId}' and F_IsDelete = 0";
+                string sql = $" and (F_ProposerDept='{User.F_DeptId}' or F_DealDept='{User.F_DeptId}' ) and F_IsDelete = 0";
                 if (!string.IsNullOrEmpty(wocode))
                 {
                     sql += $" and  F_WoCode like'%{wocode}%'";
@@ -97,7 +97,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
         /// <param name="pagesize"></param>
         /// <param name="state"></param>
         /// <returns></returns>
-        public ActionResult GetComList(string starttime = "", string endtime = "", string keyword = "", int pageindex = 1, int pagesize = 10, int state = -1, int type = 0, int loweltype = 0, string wocode = "")
+        public ActionResult GetComList(string starttime = "",string phone="", string endtime = "", string keyword = "", int pageindex = 1, int pagesize = 10, int state = -1, int type = 0, int loweltype = 0, string wocode = "")
         {
             if (User != null)
             {
@@ -131,7 +131,10 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                 {
                     sql += $" and F_Content like '%{keyword}%'";
                 }
-
+                if (!string.IsNullOrEmpty(phone))
+                {
+                    sql += $" and F_Phone = '{phone}'";
+                }
                 DataTable datatable = Bll.PagerBll.GetListPager
                                            ("T_Wo_CommonBase ",
                                              "F_WoCode",

RMYY_CallCenter_Api/Models/Enum/EnumWorkOrderState.cs

@@ -15,12 +15,12 @@ namespace RMYY_CallCenter_Api.Models.Enum
         all = -1,
         [Description("新工单待指派")]
         neworder,
-        [Description("已指派待处理")]
+        [Description("已指派待接单")]
         assign,
-        //[Description("已接单待处理")]
-        //receive,
-        //[Description("已退回待处理")]
-        //reback,
+        [Description("已接单待处理")]
+        receive,
+        [Description("已退回待处理")]
+        reback,
         //[Description("异常退回待接单")]
         //abreback,
         [Description("处理中")]
@@ -77,8 +77,8 @@ namespace RMYY_CallCenter_Api.Models.Enum
         create,
         [Description("指派")]
         assign,
-        //[Description("接单")]
-        //receive,
+        [Description("接单")]
+        receive,
         [Description("处理")]
         deal,
         [Description("退回")]

RMYY_CallCenter_Api/Models/Input/Con_WorkOrderInput.cs

@@ -406,7 +406,28 @@ namespace RMYY_CallCenter_Api.Models.Input
         {
             get; set;
         }
+        /// <summary>
+        /// 与患者关系
+        /// </summary>
+        public string F_Relationship { set; get; }
+        /// <summary>
+        /// 患者姓名
+        /// </summary>
+        public string F_FullName { set; get; }
+        /// <summary>
+        /// 患者身份证号
+        /// </summary>
+        public string F_IDNumber { set; get; }
+        /// <summary>
+        /// 投诉部门
+        /// </summary>
+        public int? F_ComplaintDept { set; get; }
+        /// <summary>
+        /// 投诉人
+        /// </summary>
+        public string F_ComplaintUser { set; get; }
 
+        public string ComplaintDept { set; get; }
         #endregion Model
 
     }