jiangjiazhi / regional-platform

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 45 additions and 9 deletions

...	...	@@ -32,7 +32,7 @@
32	32	/**
33	33	* 要显示的医院集合
34	34	*/
35		- private List<String> checkHospitalIds;
	35	+ private String[] checkHospitalIds;
36	36	/**
37	37	* 诊断时间
38	38	*/
39	39
...	...	@@ -450,11 +450,11 @@
450	450	*/
451	451	private Date confirmEndTime;
452	452
453		- public List<String> getCheckHospitalIds() {
	453	+ public String[] getCheckHospitalIds() {
454	454	return checkHospitalIds;
455	455	}
456	456
457		- public void setCheckHospitalIds(List<String> checkHospitalIds) {
	457	+ public void setCheckHospitalIds(String[] checkHospitalIds) {
458	458	this.checkHospitalIds = checkHospitalIds;
459	459	}
460	460

...	...	@@ -810,10 +810,11 @@
810	810	on hd.baby_id = sc.baby_id
811	811	<where>
812	812	<if test="checkHospitalIds != null">
813		- and sc.check_hospital_id in
814		- <foreach item="item" index="index" collection="checkHospitalIds" open="(" separator="," close=")">
815		- #{item}
	813	+ and sc.check_hospital_id in (
	814	+ <foreach item="hsId" collection="checkHospitalIds" separator=",">
	815	+ #{hsId}
816	816	</foreach>
	817	+ )
817	818	</if>
818	819	/诊断日期/
819	820	<if test="diagnoseStartTime != null ">

...	...	@@ -94,7 +94,7 @@
94	94	HighriskChangeHospitalQuery hcQuery = new HighriskChangeHospitalQuery();
95	95	hcQuery.setIntoOrgid(hospitalId);
96	96	hcQuery.setTargetId(babyId);
97		- List<String> hospitalIds = new ArrayList<>();
	97	+ List<String> hospitalIds = new ArrayList<String>();
98	98	hospitalIds.add(hospitalId);
99	99	List<HighriskChangeHospital> hchList = highchangeService.queryHighriskChangeHospital(hcQuery);
100	100	if(hchList.size()>0){
...	...	@@ -102,7 +102,7 @@
102	102	hospitalIds.add(h.getOutOrgid());
103	103	}
104	104	}
105		- query.setCheckHospitalIds(hospitalIds);
	105	+ query.setCheckHospitalIds((String[])hospitalIds.toArray(new String[hospitalIds.size()]));
106	106
107	107	List<BabyPatientExtendEarHearingDiagnose> behdList = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnose(query);
108	108	List<Map<String, String>> list = new ArrayList<>();
...	...	@@ -219,7 +219,7 @@
219	219	}
220	220
221	221	//设置要显示的医院集合
222		- query.setCheckHospitalIds(outOrgids);
	222	+ // query.setCheckHospitalIds(outOrgids);
223	223
224	224	//根据当前医院id，和已接受儿童档案的转入医院id 进行查询
225	225	if (hdReq.getEnalble() == 2) {//2待诊断，查询听筛记录，还未做听诊的

...	...	@@ -87,6 +87,41 @@
87	87	<servlet-name>dispatcher</servlet-name>
88	88	<url-pattern>/</url-pattern>
89	89	</servlet-mapping>
	90	+
	91	+ <filter>
	92	+ <filter-name>CorsFilter</filter-name>
	93	+ <filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
	94	+ <init-param>
	95	+ <param-name>cors.allowed.origins</param-name>
	96	+ <param-value>*</param-value>
	97	+ </init-param>
	98	+ <init-param>
	99	+ <param-name>cors.allowed.methods</param-name>
	100	+ <param-value>GET,POST,HEAD,OPTIONS,PUT,DELETE</param-value>
	101	+ </init-param>
	102	+ <init-param>
	103	+ <param-name>cors.allowed.headers</param-name>
	104	+ <param-value>Content-Type,X-Requested-With,accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers,authorization</param-value>
	105	+ </init-param>
	106	+ <init-param>
	107	+ <param-name>cors.exposed.headers</param-name>
	108	+ <param-value>Access-Control-Allow-Origin,Access-Control-Allow-Credentials</param-value>
	109	+ </init-param>
	110	+ <init-param>
	111	+ <param-name>cors.support.credentials</param-name>
	112	+ <param-value>true</param-value>
	113	+ </init-param>
	114	+ <init-param>
	115	+ <param-name>cors.preflight.maxage</param-name>
	116	+ <param-value>10</param-value>
	117	+ </init-param>
	118	+ </filter>
	119	+ <filter-mapping>
	120	+ <filter-name>CorsFilter</filter-name>
	121	+ <url-pattern>/*</url-pattern>
	122	+ </filter-mapping>
	123	+
	124	+
90	125	<filter>
91	126	<filter-name>perfFilter</filter-name>
92	127	<filter-class>com.lyms.platform.common.perf.SimpleHttpPerfFilter</filter-class>