From edb8eaa72e925a9bbb050ed22c592a5082e8f310 Mon Sep 17 00:00:00 2001
From: falcon <9504402@qq.com>
Date: Mon, 8 Apr 2019 14:04:13 +0800
Subject: [PATCH] =?UTF-8?q?(#18)=E4=B8=87=E4=BB=95=E8=AF=9A=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=B5=8B=E8=AF=95=E9=A1=B5=E9=9D=A2=E9=87=8D=E5=86=99?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=94=E5=9B=9E=E6=AD=A3=E7=A1=AE=E5=93=8D=E5=BA=94?=
 =?UTF-8?q?=E5=A4=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Cmdjy/Controllers/WsdInterfaceController.cs  | 16 ++++++++++------
 .../Cmdjy/Cmdjy/Views/WsdInterface/Index.cshtml  |  8 ++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/WebSiteCode/Cmdjy/Cmdjy/Controllers/WsdInterfaceController.cs b/WebSiteCode/Cmdjy/Cmdjy/Controllers/WsdInterfaceController.cs
index bbbb1ed..a97294c 100644
--- a/WebSiteCode/Cmdjy/Cmdjy/Controllers/WsdInterfaceController.cs
+++ b/WebSiteCode/Cmdjy/Cmdjy/Controllers/WsdInterfaceController.cs
@@ -17,7 +17,7 @@ namespace Cmdjy.Controllers
         public ActionResult Index() {
             var model = new WsdRequest {
                 StartNo = "0",MaxCount = "10",
-                CompanyCode = "1",CompanyName = "万仕达",
+                CompanyCode = "1",CompanyName = "万仕诚代煎药",
             };
             return PartialView(model);
         }
@@ -100,11 +100,15 @@ namespace Cmdjy.Controllers
                 result.More = db.PrescriptionInfos.Max(m => m.Id) > (start + count);
             }
             //编码：json串 +  加密信息
-            //return Json(result);
-            var resStr = JsonConvert.SerializeObject(result);
-            var mw = noDes == null ? DesHelper.GetHelper().Encrypty(cKey,resStr) : resStr;
-            logWsdRequest(info,result,resStr,mw);
-            return Content(mw);
+            if(noDes == null) {
+                var resStr = JsonConvert.SerializeObject(result);
+                var mw = DesHelper.GetHelper().Encrypty(cKey,resStr);
+                logWsdRequest(info,result,resStr,mw);
+                return Content(mw);
+            }
+            else {
+                return Json(result,JsonRequestBehavior.AllowGet);
+            }
         }
         /// <summary>
         /// 记录日志
diff --git a/WebSiteCode/Cmdjy/Cmdjy/Views/WsdInterface/Index.cshtml b/WebSiteCode/Cmdjy/Cmdjy/Views/WsdInterface/Index.cshtml
index b9f0140..e881cc0 100644
--- a/WebSiteCode/Cmdjy/Cmdjy/Views/WsdInterface/Index.cshtml
+++ b/WebSiteCode/Cmdjy/Cmdjy/Views/WsdInterface/Index.cshtml
@@ -22,11 +22,11 @@
 
 <script type="text/javascript">
   $("#wsdMsg").hide();
-  function wsdSucc(data) {
-    if (!data.match("^\{(.+:.+,*){1,}\}$")) {
-      $("#wsdMsg").show().text(data);
+  function wsdSucc(data, status, xhr) {
+    if (xhr.getResponseHeader("Content-Type").indexOf("application/json") >= 0) {
+      $("#wsdMsg").show().text(JSON.stringify(data, null, 2));
     } else {
-      $("#wsdMsg").show().text(JSON.stringify(JSON.parse(data), null, 2));
+      $("#wsdMsg").show().text(data);
     }
   }
   function wsdBeg() {