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); + } } /// /// 记录日志 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 @@