From 9d71fb1c044eff3e64fde0b2959c765f8f93a5d1 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 4 Sep 2018 16:24:29 +0800 Subject: [PATCH] update --- .../lyms/platform/common/utils/LymsEncodeUtil.java | 2 +- .../operate/web/controller/TestController.java | 20 ++++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java index 906ba38..9fa6cf9 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java @@ -26,7 +26,7 @@ public class LymsEncodeUtil { //String encrypt = aesEncrypt("com.lyms.platform.pojo.PatientWeight", key); System.out.println("加密后：" + encrypt); - String json = aesDecrypt("8A915B4A1B26D283EF1981BE0BCE6E78967C3065177F856709C3E1C9BC35AAB19153BB512619EB7FCA97377FE682CAA9", key); + String json = aesDecrypt("26EB0301C4A2410E90985A3E55856E4B394230836B32B93AD3C083D37C3C4E0BEA7B0DB8B7C18941599742DD2315584A", key); System.out.println("解密后：" + json); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index e8a0322..6d9eb30 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -1935,11 +1935,23 @@ public class TestController extends BaseController { // } - @RequestMapping(value = "/his/getClFyIdByVcCardNo") - @ResponseBody - public Map getLcdcfyByZyhHis(@RequestParam("vcCardNo") String vcCardNo) { + @RequestMapping(value = "/his/getLcdcfyHis") + @ResponseBody + public Map getLcdcfyByZyhHis(@RequestParam("vcCardNo") String vcCardNo) { + List list = new ArrayList<>(); + Map data = new HashMap<>(); + data.put("id","1114536"); + data.put("vcCardNo","0000660411"); + data.put("name","张三"); + data.put("sex","女"); + data.put("birthday","2000-11-06"); + data.put("bhnum","54345"); + data.put("phone","15622222222"); + data.put("idCard","371525200011062385"); + list.add(data); Map map = new HashMap(); - map.put("id", "1236544"); + map.put("hisPatient", list); + return map; } -- 1.8.3.1