zhangkun лет назад: 5
Родитель
Сommit
d9a8fb6650
14 измененных файлов с 657 добавлено и 362 удалено
  1. 4 0
      codegit/CallCenterApi/CallCenterApi.DAL/his/o_sf_bingrenqk.cs
  2. 12 5
      codegit/CallCenterApi/CallCenterApi.DAL/his/sf_bingrenqk.cs
  3. 29 4
      codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj
  4. 25 6
      codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/His/GetController.cs
  5. 23 7
      codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/MedicalFollowup/FollowUpController.cs
  6. 38 0
      codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Startup.cs
  7. 30 31
      codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Web.config
  8. BIN
      codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/bin/Newtonsoft.Json.dll
  9. 457 305
      codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/bin/Newtonsoft.Json.xml
  10. BIN
      codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/obj/Release/Package/PackageTmp/bin/Newtonsoft.Json.dll
  11. 6 0
      codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/obj/Release/Package/PackageTmp/packages.config
  12. 6 0
      codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/packages.config
  13. 11 0
      codegit/CallCenterApi/CallCenterApi.Model/his/o_sf_bingrenqk.cs
  14. 16 4
      codegit/CallCenterApi/CallCenterApi.Model/his/sf_bingrenqk.cs

+ 4 - 0
codegit/CallCenterApi/CallCenterApi.DAL/his/o_sf_bingrenqk.cs

@@ -243,6 +243,10 @@ namespace CallCenterApi.DAL
243 243
                 {
244 244
                     model.ZFJE = row["ZFJE"].ToString();
245 245
                 }
246
+                if (row["LRRQ"] != null)
247
+                {
248
+                    model.LRRQ = row["LRRQ"].ToString();
249
+                }
246 250
             }
247 251
             return model;
248 252
         }

+ 12 - 5
codegit/CallCenterApi/CallCenterApi.DAL/his/sf_bingrenqk.cs

@@ -148,9 +148,9 @@ namespace CallCenterApi.DAL
148 148
             {
149 149
                 StringBuilder strSql = new StringBuilder();
150 150
                 strSql.Append("insert into SF_BINGRENQK(");
151
-                strSql.Append("BAH,BINGRENZYID,BRXH,ZYCS,RYRQ,CYRQ,BRXM,XB,CSRQ,NL,NLR,GJ,HY,SFZH,HKDZ,HKDZYB,XZZ,XZZDH,XZZYB,GZDW,DWDH,DWYB,GXRXM,GX,GXRZZ,GXRDH,RYQK,RYKS,RYBS,ZKKB,CYKS,CYBS,ZYTS,RYQZRQ,KZRBH,KZRXM,ZRYSBH,ZRYSXM,ZZYSBH,ZZYSXM,ZYYSBH,ZYYSXM,ZRHSBH,ZRHSXM,LYFS,FFFS,ZFY,ZFJE)");
151
+                strSql.Append("BAH,BINGRENZYID,BRXH,ZYCS,RYRQ,CYRQ,BRXM,XB,CSRQ,NL,NLR,GJ,HY,SFZH,HKDZ,HKDZYB,XZZ,XZZDH,XZZYB,GZDW,DWDH,DWYB,GXRXM,GX,GXRZZ,GXRDH,RYQK,RYKS,RYBS,ZKKB,CYKS,CYBS,ZYTS,RYQZRQ,KZRBH,KZRXM,ZRYSBH,ZRYSXM,ZZYSBH,ZZYSXM,ZYYSBH,ZYYSXM,ZRHSBH,ZRHSXM,LYFS,FFFS,ZFY,ZFJE,LRRQ)");
152 152
                 strSql.Append(" values (");
153
-                strSql.Append("@BAH,@BINGRENZYID,@BRXH,@ZYCS,@RYRQ,@CYRQ,@BRXM,@XB,@CSRQ,@NL,@NLR,@GJ,@HY,@SFZH,@HKDZ,@HKDZYB,@XZZ,@XZZDH,@XZZYB,@GZDW,@DWDH,@DWYB,@GXRXM,@GX,@GXRZZ,@GXRDH,@RYQK,@RYKS,@RYBS,@ZKKB,@CYKS,@CYBS,@ZYTS,@RYQZRQ,@KZRBH,@KZRXM,@ZRYSBH,@ZRYSXM,@ZZYSBH,@ZZYSXM,@ZYYSBH,@ZYYSXM,@ZRHSBH,@ZRHSXM,@LYFS,@FFFS,@ZFY,@ZFJE)");
153
+                strSql.Append("@BAH,@BINGRENZYID,@BRXH,@ZYCS,@RYRQ,@CYRQ,@BRXM,@XB,@CSRQ,@NL,@NLR,@GJ,@HY,@SFZH,@HKDZ,@HKDZYB,@XZZ,@XZZDH,@XZZYB,@GZDW,@DWDH,@DWYB,@GXRXM,@GX,@GXRZZ,@GXRDH,@RYQK,@RYKS,@RYBS,@ZKKB,@CYKS,@CYBS,@ZYTS,@RYQZRQ,@KZRBH,@KZRXM,@ZRYSBH,@ZRYSXM,@ZZYSBH,@ZZYSXM,@ZYYSBH,@ZYYSXM,@ZRHSBH,@ZRHSXM,@LYFS,@FFFS,@ZFY,@ZFJE,@LRRQ)");
154 154
                 SqlParameter[] parameters = {
155 155
                     new SqlParameter("@BAH", SqlDbType.NVarChar,100),
156 156
                     new SqlParameter("@BINGRENZYID", SqlDbType.NVarChar,100),
@@ -199,7 +199,9 @@ namespace CallCenterApi.DAL
199 199
                     new SqlParameter("@LYFS", SqlDbType.NVarChar,100),
200 200
                     new SqlParameter("@FFFS", SqlDbType.NVarChar,100),
201 201
                     new SqlParameter("@ZFY", SqlDbType.NVarChar,100),
202
-                    new SqlParameter("@ZFJE", SqlDbType.NVarChar,100)};
202
+                    new SqlParameter("@ZFJE", SqlDbType.NVarChar,100),
203
+                    new SqlParameter("@LRRQ", SqlDbType.NVarChar,100)
204
+                };
203 205
                 parameters[0].Value = model.BAH;
204 206
                 parameters[1].Value = model.BINGRENZYID;
205 207
                 parameters[2].Value = model.BRXH;
@@ -248,6 +250,7 @@ namespace CallCenterApi.DAL
248 250
                 parameters[45].Value = model.FFFS;
249 251
                 parameters[46].Value = model.ZFY;
250 252
                 parameters[47].Value = model.ZFJE;
253
+                parameters[48].Value = model.LRRQ;
251 254
                 CommandInfo md=new CommandInfo(strSql.ToString(), parameters);
252 255
                 ha.Add(md);
253 256
             }
@@ -452,7 +455,7 @@ namespace CallCenterApi.DAL
452 455
 		{
453 456
 			//该表无主键信息,请自定义主键/条件字段
454 457
 			StringBuilder strSql=new StringBuilder();
455
-			strSql.Append("select  top 1 BAH,BINGRENZYID,BRXH,ZYCS,RYRQ,CYRQ,BRXM,XB,CSRQ,NL,NLR,GJ,HY,SFZH,HKDZ,HKDZYB,XZZ,XZZDH,XZZYB,GZDW,DWDH,DWYB,GXRXM,GX,GXRZZ,GXRDH,RYQK,RYKS,RYBS,ZKKB,CYKS,CYBS,ZYTS,RYQZRQ,KZRBH,KZRXM,ZRYSBH,ZRYSXM,ZZYSBH,ZZYSXM,ZYYSBH,ZYYSXM,ZRHSBH,ZRHSXM,LYFS,FFFS,ZFY,ZFJE from SF_BINGRENQK ");
458
+			strSql.Append("select  top 1 BAH,BINGRENZYID,BRXH,ZYCS,RYRQ,CYRQ,BRXM,XB,CSRQ,NL,NLR,GJ,HY,SFZH,HKDZ,HKDZYB,XZZ,XZZDH,XZZYB,GZDW,DWDH,DWYB,GXRXM,GX,GXRZZ,GXRDH,RYQK,RYKS,RYBS,ZKKB,CYKS,CYBS,ZYTS,RYQZRQ,KZRBH,KZRXM,ZRYSBH,ZRYSXM,ZZYSBH,ZZYSXM,ZYYSBH,ZYYSXM,ZRHSBH,ZRHSXM,LYFS,FFFS,ZFY,ZFJE,LRRQ from SF_BINGRENQK ");
456 459
 			strSql.Append(" where ");
457 460
             strSql.Append(" BINGRENZYID=@id ");
458 461
             SqlParameter[] parameters = { new SqlParameter("@id", id)
@@ -671,7 +674,11 @@ namespace CallCenterApi.DAL
671 674
 				{
672 675
 					model.ZFJE=row["ZFJE"].ToString();
673 676
 				}
674
-			}
677
+                if (row["LRRQ"] != null)
678
+                {
679
+                    model.LRRQ = row["LRRQ"].ToString();
680
+                }
681
+            }
675 682
 			return model;
676 683
 		}
677 684
 

+ 29 - 4
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -16,7 +16,7 @@
16 16
     <RootNamespace>CallCenterApi.Interface</RootNamespace>
17 17
     <AssemblyName>CallCenterApi.Interface</AssemblyName>
18 18
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
19
-    <UseIISExpress>true</UseIISExpress>
19
+    <UseIISExpress>false</UseIISExpress>
20 20
     <IISExpressSSLPort />
21 21
     <IISExpressAnonymousAuthentication />
22 22
     <IISExpressWindowsAuthentication />
@@ -45,6 +45,12 @@
45 45
     <WarningLevel>4</WarningLevel>
46 46
   </PropertyGroup>
47 47
   <ItemGroup>
48
+    <Reference Include="Hangfire.Core, Version=1.7.18.0, Culture=neutral, processorArchitecture=MSIL">
49
+      <HintPath>..\..\..\packages\Hangfire.Core.1.7.18\lib\net45\Hangfire.Core.dll</HintPath>
50
+    </Reference>
51
+    <Reference Include="Hangfire.SqlServer, Version=1.7.18.0, Culture=neutral, processorArchitecture=MSIL">
52
+      <HintPath>..\..\..\packages\Hangfire.SqlServer.1.7.18\lib\net45\Hangfire.SqlServer.dll</HintPath>
53
+    </Reference>
48 54
     <Reference Include="ICSharpCode.SharpZipLib">
49 55
       <HintPath>..\..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
50 56
     </Reference>
@@ -81,8 +87,14 @@
81 87
       <Private>True</Private>
82 88
     </Reference>
83 89
     <Reference Include="Microsoft.CSharp" />
84
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
85
-      <HintPath>..\..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
90
+    <Reference Include="Microsoft.Owin, Version=4.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
91
+      <HintPath>..\..\..\packages\Microsoft.Owin.4.1.1\lib\net45\Microsoft.Owin.dll</HintPath>
92
+    </Reference>
93
+    <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=4.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
94
+      <HintPath>..\..\..\packages\Microsoft.Owin.Host.SystemWeb.4.1.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
95
+    </Reference>
96
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
97
+      <HintPath>..\..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
86 98
     </Reference>
87 99
     <Reference Include="NPOI, Version=2.3.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
88 100
       <SpecificVersion>False</SpecificVersion>
@@ -100,6 +112,9 @@
100 112
       <SpecificVersion>False</SpecificVersion>
101 113
       <HintPath>..\..\..\packages\NPOI.2.3.0\lib\net40\NPOI.OpenXmlFormats.dll</HintPath>
102 114
     </Reference>
115
+    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
116
+      <HintPath>..\..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
117
+    </Reference>
103 118
     <Reference Include="Senparc.Weixin, Version=4.12.3.31913, Culture=neutral, processorArchitecture=MSIL">
104 119
       <SpecificVersion>False</SpecificVersion>
105 120
       <HintPath>Lib\Senparc.Weixin.dll</HintPath>
@@ -307,6 +322,7 @@
307 322
     <Compile Include="Models\Input\UserAccountInput.cs" />
308 323
     <Compile Include="Models\Input\WoBillInput.cs" />
309 324
     <Compile Include="Properties\AssemblyInfo.cs" />
325
+    <Compile Include="Startup.cs" />
310 326
   </ItemGroup>
311 327
   <ItemGroup>
312 328
     <Content Include="Views\web.config" />
@@ -475,7 +491,16 @@
475 491
     <VisualStudio>
476 492
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
477 493
         <WebProjectProperties>
478
-          <SaveServerSettingsInUserFile>True</SaveServerSettingsInUserFile>
494
+          <UseIIS>True</UseIIS>
495
+          <AutoAssignPort>True</AutoAssignPort>
496
+          <DevelopmentServerPort>63662</DevelopmentServerPort>
497
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
498
+          <IISUrl>http://api.dancheng.test/</IISUrl>
499
+          <NTLMAuthentication>False</NTLMAuthentication>
500
+          <UseCustomServer>False</UseCustomServer>
501
+          <CustomServerUrl>
502
+          </CustomServerUrl>
503
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
479 504
         </WebProjectProperties>
480 505
       </FlavorProperties>
481 506
     </VisualStudio>

+ 25 - 6
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/His/GetController.cs

@@ -161,9 +161,8 @@ namespace CallCenterApi.Interface.Controllers.His
161 161
         /// <returns></returns>
162 162
         public ActionResult sf_bingrenqk(string key)
163 163
         {
164
-            BLL.O_SF_BINGRENQK busSF_BINGRENQK = new BLL.O_SF_BINGRENQK();
165
-            string strWhere = " BAH='{0}' ";
166
-            Model.O_SF_BINGRENQK model = busSF_BINGRENQK.GetModel(strWhere);
164
+            string strWhere = string.Format(" BINGRENZYID='{0}' ", key);
165
+            Model.O_SF_BINGRENQK model = busO_SF_BINGRENQK.GetModel(strWhere);
167 166
             return Success("成功", model);
168 167
         }
169 168
         /// <summary>
@@ -172,11 +171,31 @@ namespace CallCenterApi.Interface.Controllers.His
172 171
         /// <returns></returns>
173 172
         public ActionResult sf_shoushuxx(string key)
174 173
         {
175
-            BLL.O_SF_SHOUSHUXX busSF_SHOUSHUXX = new BLL.O_SF_SHOUSHUXX();
176
-            string strWhere = " BINGRENZYID='{0}' ";
177
-            Model.O_SF_SHOUSHUXX model = busSF_SHOUSHUXX.GetModel(strWhere);
174
+            string strWhere = string.Format(" BINGRENZYID='{0}' ",key);
175
+            Model.O_SF_SHOUSHUXX model = busO_SF_SHOUSHUXX.GetModel(strWhere);
178 176
             return Success("成功", model);
179 177
         }
178
+        /// <summary>
179
+        /// 手术信息  通过住院ID
180
+        /// </summary>
181
+        /// <returns></returns>
182
+        public ActionResult sf_yihuxx(string key)
183
+        {
184
+            string strWhere = string.Format(" ZHIGONGID='{0}' ", key);
185
+            Model.O_SF_YIHUXX model = busO_SF_YIHUXX.GetModel(strWhere);
186
+            return Success("成功", model);
187
+        }
188
+        /// <summary>
189
+        /// 诊断信息  通过住院ID
190
+        /// </summary>
191
+        /// <returns></returns>
192
+        public ActionResult sf_zhenduan(string key)
193
+        {
194
+            string strWhere = string.Format(" BINGRENZYID='{0}' ", key);
195
+            Model.O_SF_ZHENDUAN model = busO_SF_ZHENDUAN.GetModel(strWhere);
196
+            return Success("成功", model);
197
+        }
198
+
180 199
 
181 200
     }
182 201
 }

+ 23 - 7
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/MedicalFollowup/FollowUpController.cs

@@ -62,6 +62,8 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
62 62
             string strtime = "";// HttpUtility.UrlDecode(RequestString.GetQueryString("sftime"));
63 63
             //仅包含随访结束的
64 64
             string strsfend = "";// HttpUtility.UrlDecode(RequestString.GetQueryString("sfend"));
65
+
66
+            string strResult = "";// HttpUtility.UrlDecode(RequestString.GetQueryString("sresult"));
65 67
             //仅二级随访未完成
66 68
             string strejwwc = "";//HttpUtility.UrlDecode(RequestString.GetQueryString("secondlevel"));
67 69
             //满意度
@@ -82,12 +84,16 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
82 84
             {
83 85
                 if (strstate == "2")
84 86
                 {
85
-                    sql += " and T4.F_Id IS NOT NULL ";
87
+                    sql += " and T4.F_Id IS NOT NULL and T4.F_Result='正常接通'";
86 88
                 }
87
-                else if (strstate == "0")
89
+                else if (strstate == "1")
88 90
                 {
89 91
                     sql += " and T4.F_Id IS  NULL ";
90 92
                 }
93
+                else if (strstate == "3")
94
+                {
95
+                    sql += " and T4.F_Id IS NOT NULL and T4.F_Result!='正常接通' ";
96
+                }
91 97
 
92 98
             }
93 99
             else
@@ -231,7 +237,7 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
231 237
             /// 获取随访列表
232 238
             /// </summary>
233 239
             /// <returns></returns>
234
-            public ActionResult GetListAllOld()
240
+        public ActionResult GetListAllOld()
235 241
         {
236 242
             string sql = " and F_IsDel=0 ";
237 243
             DataTable dt = new DataTable();
@@ -393,6 +399,13 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
393 399
         {
394 400
             taskid = 0;
395 401
             int cc = 0;
402
+            var hjconfig = new BLL.T_Sys_DictionaryValue().GetModel(hjjgid);
403
+
404
+            if (hjconfig == null)
405
+            {
406
+                return Error("提交结果配置不正常");
407
+            }
408
+
396 409
             if (custelid > 0)
397 410
             {
398 411
                 var otnModel = busSF_BINGRENQK.GetModel(custelid.ToString());
@@ -473,9 +486,8 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
473 486
                         modelResult.F_SFNum = 1;
474 487
                     }
475 488
 
476
-                   var hjconfig = new BLL.T_Sys_DictionaryValue().GetModel(hjjgid);
477
-                    if (hjconfig != null)
478
-                        modelResult.F_Result  = hjconfig.F_Name;
489
+
490
+                    modelResult.F_Result = hjconfig.F_Name;
479 491
                     modelResult.F_Id = custelid.ToString();
480 492
                     modelResult.F_SFPersion = CurrentUser.UserData.F_UserName;
481 493
                     modelResult.F_SFPersionId= CurrentUser.UserData.F_UserCode;
@@ -504,10 +516,14 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
504 516
                     return Error("问卷答案提交失败!custelid=" + custelid + ",操作人:" + CurrentUser.UserData.F_UserCode);
505 517
                 }
506 518
             }
507
-            else
519
+            else if (hjconfig.F_Name.Contains ("正常"))
508 520
             {
509 521
                 return Error("没有问卷答案提交");
510 522
             }
523
+            else
524
+            {
525
+                return Success("提交成功!custelid=" + custelid + ",操作人:" + CurrentUser.UserData.F_UserCode);
526
+            }
511 527
 
512 528
         }
513 529
         #endregion

+ 38 - 0
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Startup.cs

@@ -0,0 +1,38 @@
1
+using System;
2
+using System.Threading.Tasks;
3
+using Microsoft.Owin;
4
+using Owin;
5
+using Hangfire;
6
+using CallCenterApi.Interface.Controllers.His;
7
+using System.Collections.Generic;
8
+using Hangfire.Dashboard;
9
+using Hangfire.Annotations;
10
+
11
+[assembly: OwinStartup(typeof(CallCenterApi.Interface.Startup))]
12
+
13
+namespace CallCenterApi.Interface
14
+{
15
+    public class Startup
16
+    {
17
+        public void Configuration(IAppBuilder app)
18
+        {
19
+            GlobalConfiguration.Configuration.UseSqlServerStorage("ConnectionString");
20
+            app.UseHangfireDashboard("/hangfire", new DashboardOptions()
21
+            {
22
+                Authorization = new[] { new CustomAuthorizeFilter() }
23
+            });
24
+            app.UseHangfireServer();
25
+            RecurringJob.AddOrUpdate<GetController>(a => a.Data1(1), Cron.Hourly, TimeZoneInfo.Local,"updatedata1");
26
+            RecurringJob.AddOrUpdate<GetController>(a => a.Data2(1), Cron.Hourly, TimeZoneInfo.Local, "updatedata2");
27
+            RecurringJob.AddOrUpdate<GetController>(a => a.Data3(1), Cron.Hourly, TimeZoneInfo.Local, "updatedata3");
28
+            RecurringJob.AddOrUpdate<GetController>(a => a.Data4(1), Cron.Hourly, TimeZoneInfo.Local, "updatedata4");
29
+        }
30
+    }
31
+    public class CustomAuthorizeFilter : IDashboardAuthorizationFilter
32
+    {
33
+        public bool Authorize([NotNull] DashboardContext context)
34
+        {
35
+            return true;
36
+        }
37
+    }
38
+}

+ 30 - 31
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Web.config

@@ -5,30 +5,30 @@
5 5
   -->
6 6
 <configuration>
7 7
   <appSettings>
8
-    <add key="webpages:Version" value="3.0.0.0"/>
9
-    <add key="webpages:Enabled" value="false"/>
10
-    <add key="ClientValidationEnabled" value="true"/>
11
-    <add key="UnobtrusiveJavaScriptEnabled" value="true"/>
12
-    <add key="DESKey" value="123456789"/>
8
+    <add key="webpages:Version" value="3.0.0.0" />
9
+    <add key="webpages:Enabled" value="false" />
10
+    <add key="ClientValidationEnabled" value="true" />
11
+    <add key="UnobtrusiveJavaScriptEnabled" value="true" />
12
+    <add key="DESKey" value="123456789" />
13 13
     <!--短信配置-->
14
-    <add key="smsurl" value="http://api.1086sms.com/api/"/>
15
-    <add key="smsusername" value="zxzb"/>
16
-    <add key="smspassword" value="zxzb123"/>
17
-    <add key="smssign" value=""/>
14
+    <add key="smsurl" value="http://api.1086sms.com/api/" />
15
+    <add key="smsusername" value="zxzb" />
16
+    <add key="smspassword" value="zxzb123" />
17
+    <add key="smssign" value="" />
18 18
   </appSettings>
19 19
   <connectionStrings>
20
-    <add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_Dancheng;"/>
21
-    <add name="oracleconn" connectionString="Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.8.3)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=orcl)));User Id=zhangkun;Password=123456;Pooling=true;Min Pool Size=1;Max Pool Size=255;"/>
20
+    <add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_Dancheng;" />
21
+    <add name="oracleconn" connectionString="Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.8.3)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=orcl)));User Id=zhangkun;Password=123456;Pooling=true;Min Pool Size=1;Max Pool Size=255;" />
22 22
   </connectionStrings>
23 23
   <system.web>
24
-    <compilation debug="true" targetFramework="4.5"/>
25
-    <httpRuntime targetFramework="4.5"/>
24
+    <compilation debug="true" targetFramework="4.5" />
25
+    <httpRuntime targetFramework="4.5" />
26 26
     <httpModules>
27
-      <add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"/>
27
+      <add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" />
28 28
     </httpModules>
29 29
 
30 30
     <authentication>
31
-      <forms name=".MyCookie" cookieless="UseCookies" loginUrl="/Login/login" protection="All" timeout="60"/>
31
+      <forms name=".MyCookie" cookieless="UseCookies" loginUrl="/Login/login" protection="All" timeout="60" />
32 32
     </authentication>
33 33
 
34 34
 
@@ -36,27 +36,27 @@
36 36
   <runtime>
37 37
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
38 38
       <dependentAssembly>
39
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
40
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
39
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
40
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
41 41
       </dependentAssembly>
42 42
       <dependentAssembly>
43
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
44
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
43
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
44
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
45 45
       </dependentAssembly>
46 46
       <dependentAssembly>
47
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
48
-        <bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
47
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
48
+        <bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
49
+      </dependentAssembly>
50
+      <dependentAssembly>
51
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
52
+        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
49 53
       </dependentAssembly>
50 54
     </assemblyBinding>
51 55
   </runtime>
52 56
   <system.codedom>
53 57
     <compilers>
54
-      <compiler language="c#;cs;csharp" extension=".cs"
55
-        type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
56
-        warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701"/>
57
-      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb"
58
-        type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
59
-        warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
58
+      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701" />
59
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
60 60
     </compilers>
61 61
   </system.codedom>
62 62
   <system.webServer>
@@ -70,12 +70,11 @@
70 70
       </customHeaders>
71 71
     </httpProtocol>
72 72
     <!--cors 支持跨域 end-->
73
-    <validation validateIntegratedModeConfiguration="false"/>
73
+    <validation validateIntegratedModeConfiguration="false" />
74 74
 
75 75
     <modules>
76
-      <remove name="ApplicationInsightsWebTracking"/>
77
-      <add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"
78
-        preCondition="managedHandler"/>
76
+      <remove name="ApplicationInsightsWebTracking" />
77
+      <add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" preCondition="managedHandler" />
79 78
     </modules>
80 79
   </system.webServer>
81 80
 </configuration>

BIN
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/bin/Newtonsoft.Json.dll


Разница между файлами не показана из-за своего большого размера
+ 457 - 305
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/bin/Newtonsoft.Json.xml


BIN
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/obj/Release/Package/PackageTmp/bin/Newtonsoft.Json.dll


+ 6 - 0
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/obj/Release/Package/PackageTmp/packages.config

@@ -1,5 +1,7 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2 2
 <packages>
3
+  <package id="Hangfire.Core" version="1.7.18" targetFramework="net45" />
4
+  <package id="Hangfire.SqlServer" version="1.7.18" targetFramework="net45" />
3 5
   <package id="log4net" version="2.0.8" targetFramework="net45" />
4 6
   <package id="Microsoft.ApplicationInsights" version="2.2.0" targetFramework="net45" />
5 7
   <package id="Microsoft.ApplicationInsights.Agent.Intercept" version="2.0.6" targetFramework="net45" />
@@ -16,5 +18,9 @@
16 18
   <package id="Microsoft.AspNet.WebPages.zh-Hans" version="3.2.3" targetFramework="net45" />
17 19
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.0" targetFramework="net45" />
18 20
   <package id="Microsoft.Net.Compilers" version="1.0.0" targetFramework="net45" developmentDependency="true" />
21
+  <package id="Microsoft.Owin" version="4.1.1" targetFramework="net45" />
22
+  <package id="Microsoft.Owin.Host.SystemWeb" version="4.1.1" targetFramework="net45" />
19 23
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
24
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
25
+  <package id="Owin" version="1.0" targetFramework="net45" />
20 26
 </packages>

+ 6 - 0
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/packages.config

@@ -1,5 +1,7 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2 2
 <packages>
3
+  <package id="Hangfire.Core" version="1.7.18" targetFramework="net45" />
4
+  <package id="Hangfire.SqlServer" version="1.7.18" targetFramework="net45" />
3 5
   <package id="log4net" version="2.0.8" targetFramework="net45" />
4 6
   <package id="Microsoft.ApplicationInsights" version="2.2.0" targetFramework="net45" />
5 7
   <package id="Microsoft.ApplicationInsights.Agent.Intercept" version="2.0.6" targetFramework="net45" />
@@ -16,5 +18,9 @@
16 18
   <package id="Microsoft.AspNet.WebPages.zh-Hans" version="3.2.3" targetFramework="net45" />
17 19
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.0" targetFramework="net45" />
18 20
   <package id="Microsoft.Net.Compilers" version="1.0.0" targetFramework="net45" developmentDependency="true" />
21
+  <package id="Microsoft.Owin" version="4.1.1" targetFramework="net45" />
22
+  <package id="Microsoft.Owin.Host.SystemWeb" version="4.1.1" targetFramework="net45" />
19 23
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
24
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
25
+  <package id="Owin" version="1.0" targetFramework="net45" />
20 26
 </packages>

+ 11 - 0
codegit/CallCenterApi/CallCenterApi.Model/his/o_sf_bingrenqk.cs

@@ -58,6 +58,17 @@ namespace CallCenterApi.Model
58 58
         private string _fffs;
59 59
         private string _zfy;
60 60
         private string _zfje;
61
+        private string _lrrq;
62
+
63
+
64
+        /// <summary>
65
+        /// 
66
+        /// </summary>
67
+        public string LRRQ
68
+        {
69
+            set { _lrrq = value; }
70
+            get { return _lrrq; }
71
+        }
61 72
         /// <summary>
62 73
         /// 
63 74
         /// </summary>

+ 16 - 4
codegit/CallCenterApi/CallCenterApi.Model/his/sf_bingrenqk.cs

@@ -74,10 +74,22 @@ namespace CallCenterApi.Model
74 74
 		private string _fffs;
75 75
 		private string _zfy;
76 76
 		private string _zfje;
77
-		/// <summary>
78
-		/// 
79
-		/// </summary>
80
-		public string BAH
77
+        private string _lrrq;
78
+
79
+
80
+        /// <summary>
81
+        /// 
82
+        /// </summary>
83
+        public string LRRQ
84
+        {
85
+            set { _lrrq = value; }
86
+            get { return _lrrq; }
87
+        }
88
+
89
+        /// <summary>
90
+        /// 
91
+        /// </summary>
92
+        public string BAH
81 93
 		{
82 94
 			set{ _bah=value;}
83 95
 			get{return _bah;}