jiangjiazhi / regional-platform

Authored by liquanyu over 8 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 6 additions and 4 deletions

...	...	@@ -365,7 +365,7 @@
365	365	PHONE AS phone
366	366	FROM LIS_REPORT_TBL
367	367	<include refid="LisCondition"/>
368		- AND PHONE IS NOT NULL AND VCCARDNO IS NOT NULL
	368	+ AND (LENGTH(PHONE) > 0 OR LENGTH(VCCARDNO) > 0)
369	369	<include refid="orderAndLimit"/>
370	370	</select>
371	371

...	...	@@ -147,6 +147,7 @@
147	147	@RequestParam(required = false) Integer status,
148	148	@RequestHeader("Authorization") String token) {
149	149
	150	+ System.out.println("patientIds="+patientIds);
150	151	if (!"3d19960bf3e81e7d816c4f26051c49ba".equals(token))
151	152	{
152	153	ExceptionUtils.catchException("The request token is " + token);

...	...	@@ -79,9 +79,9 @@
79	79	if("7".equals(HIS_VERSION)){
80	80	//根据调用接口获取四川南充中心医院的Lis数据
81	81	result.addAll(NczxyyLisService.queryLisCheckList(vcCardNo));
82		- }else if("6".equals(HIS_VERSION)){
83		- //调用德州妇幼lis接口
84		- result.addAll(DzfyHisService.queryLisCheckList(vcCardNo));
	82	+// }else if("6".equals(HIS_VERSION)){
	83	+// //调用德州妇幼lis接口
	84	+// result.addAll(DzfyHisService.queryLisCheckList(vcCardNo));
85	85	}
86	86	else{
87	87	result.addAll(queryLisCheckList(vcCardNo,phone,userId));
...	...	@@ -552,6 +552,7 @@
552	552
553	553	Map<String,String> hospitalNames = getHospitalNames(hosptalIds);
554	554	lises = lisService.queryLisDataByQuery(query);
	555	+ System.out.println("patientIds==" + patientIds + "; lies siez = " + lises.size());
555	556	// 排序
556	557	Collections.sort(lises, new Comparator() {
557	558	public int compare(Object a, Object b) {