jiangjiazhi / regional-platform

Commit f251e7ab017b21732d163e85dedc060010230b64

Authored by liquanyu over 6 years ago

Exists in master and in 6 other branches

update

Showing 3 changed files with 12 additions and 5 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java

...	...	@@ -26,7 +26,7 @@
26	26
27	27	//String encrypt = aesEncrypt("com.lyms.platform.pojo.PatientWeight", key); System.out.println("加密后：" + encrypt);
28	28
29		- String json = aesDecrypt("26EB0301C4A2410E90985A3E55856E4B94848F070CCE3F6400CF502216F6DD18ED0A0A43348E4AB0AB97B38E4CEFEA7A4E1D74EE1671DAD6AC72560C5329BC05", key);
	29	+ String json = aesDecrypt("26EB0301C4A2410E90985A3E55856E4BC90B764322A576155B201AFB0BC8C94FFAB29197A8B86F592DD2ABABF896EB89", key);
30	30	System.out.println("解密后：" + json);
31	31
32	32	}

...	...	@@ -132,10 +132,11 @@
132	132	@RequestParam("sortType") Integer sortType,
133	133	@RequestParam(required = false) String phone,
134	134	@RequestParam(required = false) String cardNo,
	135	+ @RequestParam(required = false) String userName,
135	136	@RequestParam(defaultValue = "1") Integer perType,//默认孕妇
136	137	HttpServletRequest request) {
137	138	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
138		- return lisFacade.getLisAndRisData(vcCardNo, phone,cardNo, sortType,perType, loginState.getId());
	139	+ return lisFacade.getLisAndRisData(vcCardNo, phone,cardNo, sortType,perType, userName,loginState.getId());
139	140	}
140	141
141	142

...	...	@@ -88,13 +88,13 @@
88	88	* @param perType 2-儿童，其他是孕妇
89	89	* @return
90	90	*/
91		- public BaseResponse getLisAndRisData(String vcCardNo, String phone, String cardNo, Integer sortType, int perType, Integer userId) {
	91	+ public BaseResponse getLisAndRisData(String vcCardNo, String phone, String cardNo, Integer sortType, int perType,String userName, Integer userId) {
92	92
93	93	List<CheckByDate> checkByDate = new ArrayList<CheckByDate>();
94	94	//根据用户id获取医院ID
95	95	String hospitalId = autoMatchFacade.getHospitalId(userId);
96	96
97		- List<CheckResponse> result = queryLisCheckList(vcCardNo, phone, hospitalId, cardNo, perType);
	97	+ List<CheckResponse> result = queryLisCheckList(vcCardNo, phone, hospitalId, cardNo, perType, userName);
98	98
99	99	//排序检查大项
100	100	sortLis(result);
...	...	@@ -232,7 +232,7 @@
232	232	* @param perType 2-儿童
233	233	* @return
234	234	*/
235		- public List<CheckResponse> queryLisCheckList(String vcCardNo, String phone, String hospitalId, String cardNo, int perType) {
	235	+ public List<CheckResponse> queryLisCheckList(String vcCardNo, String phone, String hospitalId, String cardNo, int perType,String userName) {
236	236
237	237	//保存这个人在所有医院的lis记录
238	238	List<CheckResponse> result = new ArrayList<>();
239	239
...	...	@@ -247,7 +247,12 @@
247	247
248	248	LisReportQuery model = new LisReportQuery();
249	249
	250	+ if (StringUtils.isNotEmpty(userName))
	251	+ {
	252	+ model.setName(userName);
	253	+ }
250	254
	255	+
251	256	if (perType == 2) {//儿童
252	257	model.setHospitalId(hospitalId);
253	258	//通过就诊卡号和医院id查询到医院下面的lis记录
...	...	@@ -442,6 +447,7 @@
442	447	{
443	448	return reportModelList;
444	449	}
	450	+
445	451
446	452	List<LisReportModel> lises = lisService.queryLisDataByModel(model);
447	453	if (CollectionUtils.isNotEmpty(lises)) {