F_EmergencyTypes

RMYY_CallCenter_Api.Dal/T_FaultRepair_Base.cs

@@ -520,7 +520,7 @@ namespace RMYY_CallCenter_Api.DAL
 			{
 				strSql.Append(" top "+Top.ToString());
 			}
-			strSql.Append(" F_WorkOrderId,F_WorkOrderCode,F_Applicant,F_ApplicationDept,F_Applicantsphone,F_Phone,F_WorkOrderCategory,F_Content,F_PlaceOfRepair,F_WorkOrderState,F_Maintenancer,F_MaintenanceDept,F_AssignTime,F_Endtime,F_UpdateTime,F_Deadline,F_CreateUser,F_CreateTime,F_CreateUserDept,F_File,F_ReturnNum,F_InternalWorkOrderCode,F_ExternalWorkOrderCode,F_IsDelete ,F_ReplayCount");
+			strSql.Append(" F_WorkOrderId,F_EmergencyTypes,F_WorkOrderCode,F_Applicant,F_ApplicationDept,F_Applicantsphone,F_Phone,F_WorkOrderCategory,F_Content,F_PlaceOfRepair,F_WorkOrderState,F_Maintenancer,F_MaintenanceDept,F_AssignTime,F_Endtime,F_UpdateTime,F_Deadline,F_CreateUser,F_CreateTime,F_CreateUserDept,F_File,F_ReturnNum,F_InternalWorkOrderCode,F_ExternalWorkOrderCode,F_IsDelete ,F_ReplayCount");
 			strSql.Append(" FROM T_FaultRepair_Base ");
 			if(strWhere.Trim()!="")
 			{

RMYY_CallCenter_Api.Dal/T_IntegratedScheduling_Base.cs

@@ -493,7 +493,7 @@ namespace RMYY_CallCenter_Api.DAL
 			{
 				strSql.Append(" top "+Top.ToString());
 			}
-			strSql.Append(" F_WorkOrderId,F_WorkOrderCode,F_WorkOrderCategory,F_Content,F_Applicant,F_ApplicationDept,F_Phone,F_Location,F_ToPlace,F_WorkOrderState,F_DealMan,F_DealDept,F_ReplayCount,F_RemindCount,F_CallId,F_CallRecordId,F_AssignTime,F_AssignUser,F_Endtime,F_Deadline,F_UpdateTime,F_CreateTime,F_CreateUser,F_CreateUserDept,F_File,F_IsDelete,F_LeaveRecordId ");
+			strSql.Append(" F_WorkOrderId,F_WorkOrderCode,F_EmergencyTypes,F_WorkOrderCategory,F_Content,F_Applicant,F_ApplicationDept,F_Phone,F_Location,F_ToPlace,F_WorkOrderState,F_DealMan,F_DealDept,F_ReplayCount,F_RemindCount,F_CallId,F_CallRecordId,F_AssignTime,F_AssignUser,F_Endtime,F_Deadline,F_UpdateTime,F_CreateTime,F_CreateUser,F_CreateUserDept,F_File,F_IsDelete,F_LeaveRecordId ");
 			strSql.Append(" FROM T_IntegratedScheduling_Base ");
 			if(strWhere.Trim()!="")
 			{

RMYY_CallCenter_Api.Dal/T_Sys_UserAccount.cs

@@ -38,9 +38,9 @@ namespace RMYY_CallCenter_Api.Dal
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Sys_UserAccount(");
-            strSql.Append("F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_Sex,F_Telephone,F_WxOpenId,F_Remark,F_SeatFlag,F_SeatGroup,F_EnableFlag,F_CreateUser,F_CreateTime,F_DeleteFlag,F_DeleteUser,F_DeleteTime,F_See,F_WorkPhone,F_HomeAddress,F_Job,F_StaffCode)");
+            strSql.Append("F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_Sex,F_Telephone,F_WxOpenId,F_Remark,F_SeatFlag,F_SeatGroup,F_EnableFlag,F_CreateUser,F_CreateTime,F_DeleteFlag,F_DeleteUser,F_DeleteTime,F_See,F_WorkPhone,F_HomeAddress,F_Job,F_StaffCode,F_Title)");
             strSql.Append(" values (");
-            strSql.Append("@F_UserCode,@F_Password,@F_ExtensionNumber,@F_UserName,@F_DeptId,@F_RoleId,@F_Sex,@F_Telephone,@F_WxOpenId,@F_Remark,@F_SeatFlag,@F_SeatGroup,@F_EnableFlag,@F_CreateUser,@F_CreateTime,@F_DeleteFlag,@F_DeleteUser,@F_DeleteTime,@F_See,@F_WorkPhone,@F_HomeAddress,@F_Job,@F_StaffCode)");
+            strSql.Append("@F_UserCode,@F_Password,@F_ExtensionNumber,@F_UserName,@F_DeptId,@F_RoleId,@F_Sex,@F_Telephone,@F_WxOpenId,@F_Remark,@F_SeatFlag,@F_SeatGroup,@F_EnableFlag,@F_CreateUser,@F_CreateTime,@F_DeleteFlag,@F_DeleteUser,@F_DeleteTime,@F_See,@F_WorkPhone,@F_HomeAddress,@F_Job,@F_StaffCode,@F_Title)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_UserCode", SqlDbType.VarChar,50),
@@ -65,7 +65,8 @@ namespace RMYY_CallCenter_Api.Dal
                     new SqlParameter("@F_WorkPhone", SqlDbType.VarChar,50),
                     new SqlParameter("@F_HomeAddress", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_Job", SqlDbType.NVarChar,200),
-                    new SqlParameter("@F_StaffCode", SqlDbType.NVarChar,50)
+                    new SqlParameter("@F_StaffCode", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_Title", SqlDbType.NVarChar,200)
                     
             };
             parameters[0].Value = model.F_UserCode;
@@ -91,6 +92,7 @@ namespace RMYY_CallCenter_Api.Dal
             parameters[20].Value = model.F_HomeAddress;
             parameters[21].Value = model.F_Job;
             parameters[22].Value = model.F_StaffCode;
+            parameters[23].Value = model.F_Title;
             
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -131,7 +133,9 @@ namespace RMYY_CallCenter_Api.Dal
             strSql.Append("F_WorkPhone=@F_WorkPhone,");
             strSql.Append("F_HomeAddress=@F_HomeAddress,");
             strSql.Append("F_Job=@F_Job,");
-            strSql.Append("F_StaffCode=@F_StaffCode");
+            strSql.Append("F_StaffCode=@F_StaffCode,");
+            strSql.Append("F_Title=@F_Title");
+            
             strSql.Append(" where F_UserId=@F_UserId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_UserCode", SqlDbType.VarChar,50),
@@ -157,6 +161,7 @@ namespace RMYY_CallCenter_Api.Dal
                     new SqlParameter("@F_HomeAddress", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_Job", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_StaffCode", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_Title", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_UserId", SqlDbType.Int,4)};
             parameters[0].Value = model.F_UserCode;
             parameters[1].Value = model.F_Password;
@@ -181,7 +186,8 @@ namespace RMYY_CallCenter_Api.Dal
             parameters[20].Value = model.F_HomeAddress;
             parameters[21].Value = model.F_Job;
             parameters[22].Value = model.F_StaffCode;
-            parameters[23].Value = model.F_UserId;
+            parameters[23].Value = model.F_Title;
+            parameters[24].Value = model.F_UserId;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -414,6 +420,10 @@ namespace RMYY_CallCenter_Api.Dal
                 {
                     model.F_StaffCode = row["F_StaffCode"].ToString();
                 }
+                if (row["F_Title"] != null)
+                {
+                    model.F_Title = row["F_Title"].ToString();
+                }
                 
             }
             return model;

RMYY_CallCenter_Api.Model/T_Sys_UserAccount.cs

@@ -247,6 +247,13 @@ namespace RMYY_CallCenter_Api.Model
             set { _f_job = value; }
             get { return _f_job; }
         }
+        /// <summary>
+        /// 职称
+        /// </summary>
+        public string F_Title
+        {
+            get; set;
+        }
         #endregion Model
 
         public int deptype { get; set; }

RMYY_CallCenter_Api/Configs/system.config

@@ -85,5 +85,4 @@
     <!--360-->
      <add key="PortalURL" value ="http://172.16.0.138:10016/"/>
 
-  
 </appSettings>

RMYY_CallCenter_Api/Controllers/HospitalUserController.cs

@@ -412,6 +412,17 @@ namespace RMYY_CallCenter_Api.Controllers
             public string ZhiName { set; get; }//性别名称
         }
         /// <summary>
+        /// 职称
+        /// </summary>
+        public class DictTitle
+        {
+            public int No_Title { set; get; }//主键
+            public string TitleName { set; get; }//名称
+            public string TitleCode { set; get; }//编码
+        }
+     
+
+        /// <summary>
         /// 人员
         /// </summary>
         public class DictStaff
@@ -423,6 +434,8 @@ namespace RMYY_CallCenter_Api.Controllers
             public string dhhm { set; get; }//联系电话
             public string StaffCode { set; get; }//人员编码
             public int? zw { set; get; }//职务
+            public int? noTitle { set; get; }//职称
+            public bool?  bStopFlag { set; get; }//停用标识
         }
         public int Getcode()
         {
@@ -523,9 +536,13 @@ namespace RMYY_CallCenter_Api.Controllers
          //   var respon = HttpMethods.HttpPost($"http://{ip}:{port}/{master}/webApi/DictZhiwu", keyValuePairszhiwu.ToJson());
 
             var respon = web.DownloadString($"http://{ip}:{port}/{master}/webApi/DictZhiwu");
-            LogHelper.Warn("Staff-respon:" + respon);
             List<DictZhiwu> zhuwu = JsonConvert.DeserializeObject<List<DictZhiwu>>(respon);
-            LogHelper.Warn("Staff-zhuwu:" + zhuwu.ToJson());
+           
+
+
+            var zhichengrespon = web.DownloadString($"http://{ip}:{port}/{master}/webApi/DictTitle");
+            List<DictTitle> zhicheng = JsonConvert.DeserializeObject<List<DictTitle>>(zhichengrespon);
+           
 
 
 
@@ -535,9 +552,8 @@ namespace RMYY_CallCenter_Api.Controllers
             //   keyValuePairs.Add("DictStaff", "DictStaff");
             //var responseString = HttpMethods.HttpPost($"http://{ip}:{port}/{master}/webApi/DictStaff", keyValuePairs.ToJson());
             var responseString = web.DownloadString($"http://{ip}:{port}/{master}/webApi/DictStaff");
-            LogHelper.Warn("Staff-responseString:" + responseString);
             List<DictStaff> jo = JsonConvert.DeserializeObject<List<DictStaff>>(responseString);
-            LogHelper.Warn("Staff-jo:" + jo.ToJson());
+         
           //  var user = jo.Where(x => x.noDept == noDept);
             var list = new Bll.T_Sys_UserAccount().GetModelList("F_DeleteFlag=0");
             if (jo != null && jo.Count() > 0)
@@ -549,8 +565,7 @@ namespace RMYY_CallCenter_Api.Controllers
                         if (list.Where(x => x.F_StaffCode == it.StaffCode ).Count() > 0)
                             continue;
                         Model.T_Sys_UserAccount ua = new Model.T_Sys_UserAccount();
-                        int usercode = Getcode();
-                        ua.F_UserCode = usercode.ToString();
+                        ua.F_UserCode = it.StaffCode;
                         ua.F_UserName = it.StaffName ;
                         ua.F_Password = "e10adc3949ba59abbe56e057f20f883e";
                         ua.F_ExtensionNumber = "";
@@ -579,7 +594,16 @@ namespace RMYY_CallCenter_Api.Controllers
                             if (uazhuwu != null && uazhuwu.Count() > 0)
                                 ua.F_Job = uazhuwu.FirstOrDefault().ZhiName;
                         }
-                        ua.F_DeleteFlag = 0;
+                        if (it.noTitle  != null)
+                        {
+                            var uazhuwu = zhicheng .Where(x => x.No_Title  == it.noTitle);
+                            if (uazhuwu != null && uazhuwu.Count() > 0)
+                                ua.F_Title = uazhuwu.FirstOrDefault().TitleName ;
+                        }
+                        if (it .bStopFlag!=null &&it .bStopFlag.Value  )
+                            ua.F_DeleteFlag = 1;
+                        else
+                            ua.F_DeleteFlag = 0;
                         new Bll.T_Sys_UserAccount().Add(ua);
                     }
                 }
@@ -912,9 +936,12 @@ namespace RMYY_CallCenter_Api.Controllers
 
 
                 var respon = web.DownloadString($"http://{ip}:{port}/{master}/webApi/DictZhiwu");
-                LogHelper.Warn("Staff-respon:" + respon);
                 List<DictZhiwu> zhuwu = JsonConvert.DeserializeObject<List<DictZhiwu>>(respon);
-                LogHelper.Warn("Staff-zhuwu:" + zhuwu.ToJson());
+              
+
+                var zhichengrespon = web.DownloadString($"http://{ip}:{port}/{master}/webApi/DictTitle");
+                List<DictTitle> zhicheng = JsonConvert.DeserializeObject<List<DictTitle>>(zhichengrespon);
+
 
 
                 var list = new Bll.T_Sys_UserAccount().GetModelList("F_DeleteFlag=0");
@@ -949,9 +976,19 @@ namespace RMYY_CallCenter_Api.Controllers
                             if (uazhuwu != null && uazhuwu.Count() > 0)
                                 ua.F_Job = uazhuwu.FirstOrDefault().ZhiName;
                         }
-                      
-                        ua.F_DeleteFlag = 0;
-                       int n = new Bll.T_Sys_UserAccount().Add(ua);
+
+                        if (jo .noTitle != null)
+                        {
+                            var uazhuwu = zhicheng.Where(x => x.No_Title == jo .noTitle);
+                            if (uazhuwu != null && uazhuwu.Count() > 0)
+                                ua.F_Title = uazhuwu.FirstOrDefault().TitleName;
+                        }
+
+                        if (jo.bStopFlag != null && jo.bStopFlag.Value)
+                            ua.F_DeleteFlag = 1;
+                        else
+                            ua.F_DeleteFlag = 0;
+                        int n = new Bll.T_Sys_UserAccount().Add(ua);
                         if (n > 0)
                         {
                             var obj = new
@@ -1009,7 +1046,16 @@ namespace RMYY_CallCenter_Api.Controllers
                             if (uazhuwu != null && uazhuwu.Count() > 0)
                                 ua.F_Job = uazhuwu.FirstOrDefault().ZhiName;
                         }
-                        ua.F_DeleteFlag = 0;
+                        if (jo.noTitle != null)
+                        {
+                            var uazhuwu = zhicheng.Where(x => x.No_Title == jo.noTitle);
+                            if (uazhuwu != null && uazhuwu.Count() > 0)
+                                ua.F_Title = uazhuwu.FirstOrDefault().TitleName;
+                        }
+                        if (jo.bStopFlag != null && jo.bStopFlag.Value)
+                            ua.F_DeleteFlag = 1;
+                        else
+                            ua.F_DeleteFlag = 0;
                         //int n = new Bll.T_Sys_UserAccount().Add(ua);
                         bool n = new Bll.T_Sys_UserAccount().Update(ua);
                         if (n)

RMYY_CallCenter_Api/Controllers/PatientController.cs

@@ -163,11 +163,11 @@ namespace RMYY_CallCenter_Api.Controllers
             stringBuilder.Append($"<FromLimit></FromLimit><ToLimit></ToLimit>");
             stringBuilder.Append($"<FromDateTime>{starttime}</FromDateTime><ToDateTime>{endtime}</ToDateTime>");
             stringBuilder.Append($"<PatientClass>{PatientClass}</PatientClass>");//PatientClassI-入院，O-门诊，E-急诊
-            stringBuilder.Append(@"<VisitNumbers>");
+            stringBuilder.Append(@"<VisitNumbers\VisitNumber>");
             stringBuilder.Append($"<CardID></CardID>");
             stringBuilder.Append($"<DomainCode></DomainCode>");
             stringBuilder.Append($"<Facility>{Facility}</Facility>");//院区代码
-            stringBuilder.Append(@"</VisitNumbers>");
+            stringBuilder.Append(@"</VisitNumbers\VisitNumber>");
             stringBuilder.Append($"<GlobalPID>{GlobalPID}</GlobalPID>");//患者主索引号
             //stringBuilder.Append(@"<PatientIDs\PatientID>");
             //stringBuilder.Append($"<CardID></CardID>");