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 05686dc..e280563 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("26EB0301C4A2410E90985A3E55856E4B94848F070CCE3F6400CF502216F6DD18ED0A0A43348E4AB0AB97B38E4CEFEA7A4E1D74EE1671DAD6AC72560C5329BC05", key); + String json = aesDecrypt("26EB0301C4A2410E90985A3E55856E4BC90B764322A576155B201AFB0BC8C94FFAB29197A8B86F592DD2ABABF896EB89", key); System.out.println("解密后:" + json); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java index edc934a..0aa9172 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java @@ -132,10 +132,11 @@ public class LisController extends BaseController { @RequestParam("sortType") Integer sortType, @RequestParam(required = false) String phone, @RequestParam(required = false) String cardNo, + @RequestParam(required = false) String userName, @RequestParam(defaultValue = "1") Integer perType,//默认孕妇 HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return lisFacade.getLisAndRisData(vcCardNo, phone,cardNo, sortType,perType, loginState.getId()); + return lisFacade.getLisAndRisData(vcCardNo, phone,cardNo, sortType,perType, userName,loginState.getId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java index 7fb4507..6cbabaa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java @@ -88,13 +88,13 @@ public class LisFacade { * @param perType 2-儿童,其他是孕妇 * @return */ - public BaseResponse getLisAndRisData(String vcCardNo, String phone, String cardNo, Integer sortType, int perType, Integer userId) { + public BaseResponse getLisAndRisData(String vcCardNo, String phone, String cardNo, Integer sortType, int perType,String userName, Integer userId) { List checkByDate = new ArrayList(); //根据用户id获取医院ID String hospitalId = autoMatchFacade.getHospitalId(userId); - List result = queryLisCheckList(vcCardNo, phone, hospitalId, cardNo, perType); + List result = queryLisCheckList(vcCardNo, phone, hospitalId, cardNo, perType, userName); //排序检查大项 sortLis(result); @@ -232,7 +232,7 @@ public class LisFacade { * @param perType 2-儿童 * @return */ - public List queryLisCheckList(String vcCardNo, String phone, String hospitalId, String cardNo, int perType) { + public List queryLisCheckList(String vcCardNo, String phone, String hospitalId, String cardNo, int perType,String userName) { //保存这个人在所有医院的lis记录 List result = new ArrayList<>(); @@ -247,6 +247,11 @@ public class LisFacade { LisReportQuery model = new LisReportQuery(); + if (StringUtils.isNotEmpty(userName)) + { + model.setName(userName); + } + if (perType == 2) {//儿童 model.setHospitalId(hospitalId); @@ -443,6 +448,7 @@ public class LisFacade { return reportModelList; } + List lises = lisService.queryLisDataByModel(model); if (CollectionUtils.isNotEmpty(lises)) { reportModelList.addAll(lises);