jiangjiazhi / regional-platform

Commit c25ad6b916c21b16d459c6a4e65ed6ba22517951

Authored by wtt over 4 years ago

Exists in master and in 6 other branches

update

Showing 4 changed files with 116 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java

...	...	@@ -2626,9 +2626,35 @@
2626	2626	}
2627	2627
2628	2628	//初诊医院查询
2629		- if (childbirthManagerRequest.getCzHospitalId() != null) {
	2629	+ List <String> chospitalList = new ArrayList <>();
	2630	+ if (StringUtils.isNotEmpty(childbirthManagerRequest.getCzHospitalId())) {
	2631	+ chospitalList.add(childbirthManagerRequest.getCzHospitalId());
	2632	+ } else if (StringUtils.isNotEmpty(childbirthManagerRequest.getCprovinceId())) {
	2633	+ OrganizationQuery organizationQuery = new OrganizationQuery();
	2634	+ organizationQuery.setYn(YnEnums.YES.getId());
	2635	+ organizationQuery.setProvinceId(childbirthManagerRequest.getCprovinceId());
	2636	+ if (StringUtils.isNotEmpty(childbirthManagerRequest.getCcityId())) {
	2637	+ organizationQuery.setCityId(childbirthManagerRequest.getCcityId());
	2638	+ if (StringUtils.isNotEmpty(childbirthManagerRequest.getCareaId())) {
	2639	+ organizationQuery.setAreaId(childbirthManagerRequest.getCareaId());
	2640	+ }
	2641	+ }
	2642	+ List <String> orgId = new ArrayList <>();
	2643	+ List <Organization> organizations = organizationService.queryOrganization(organizationQuery);
	2644	+ if (CollectionUtils.isNotEmpty(organizations)) {
	2645	+ for (Organization org : organizations) {
	2646	+ if (null != org.getId()) {
	2647	+ orgId.add(org.getId() + "");
	2648	+ }
	2649	+ }
	2650	+ }
	2651	+ if (CollectionUtils.isNotEmpty(orgId)) {
	2652	+ chospitalList.addAll(orgId);
	2653	+ }
	2654	+ }
	2655	+ if (CollectionUtils.isNotEmpty(chospitalList)) {
2630	2656	AntExChuQuery antExChuQuery1 = new AntExChuQuery();
2631		- antExChuQuery1.setHospitalId(childbirthManagerRequest.getCzHospitalId());
	2657	+ antExChuQuery1.setHospitalList(chospitalList);
2632	2658	antExChuQuery1.setCheckTimeStart(DateUtil.getDayStartTime(DateUtil.parseYMD(childbirthManagerRequest.getCzDateStart())));
2633	2659	antExChuQuery1.setCheckTimeEnd(DateUtil.getDayEndTime(DateUtil.parseYMD(childbirthManagerRequest.getCzDateEnd())));
2634	2660	antExChuQuery1.setYn(YnEnums.YES.getId());

...	...	@@ -836,9 +836,35 @@
836	836	return RespBuilder.buildSuccess(pageResult);
837	837	}
838	838	//初诊医院查询
839		- if (downQueryRequest.getCzHospitalId() != null) {
	839	+ List <String> chospitalList = new ArrayList <>();
	840	+ if (StringUtils.isNotEmpty(downQueryRequest.getCzHospitalId())) {
	841	+ chospitalList.add(downQueryRequest.getCzHospitalId());
	842	+ } else if (StringUtils.isNotEmpty(downQueryRequest.getCprovinceId())) {
	843	+ OrganizationQuery organizationQuery = new OrganizationQuery();
	844	+ organizationQuery.setYn(YnEnums.YES.getId());
	845	+ organizationQuery.setProvinceId(downQueryRequest.getCprovinceId());
	846	+ if (StringUtils.isNotEmpty(downQueryRequest.getCcityId())) {
	847	+ organizationQuery.setCityId(downQueryRequest.getCcityId());
	848	+ if (StringUtils.isNotEmpty(downQueryRequest.getCareaId())) {
	849	+ organizationQuery.setAreaId(downQueryRequest.getCareaId());
	850	+ }
	851	+ }
	852	+ List <String> orgId = new ArrayList <>();
	853	+ List <Organization> organizations = organizationService.queryOrganization(organizationQuery);
	854	+ if (CollectionUtils.isNotEmpty(organizations)) {
	855	+ for (Organization org : organizations) {
	856	+ if (null != org.getId()) {
	857	+ orgId.add(org.getId() + "");
	858	+ }
	859	+ }
	860	+ }
	861	+ if (CollectionUtils.isNotEmpty(orgId)) {
	862	+ chospitalList.addAll(orgId);
	863	+ }
	864	+ }
	865	+ if (CollectionUtils.isNotEmpty(chospitalList)) {
840	866	AntExChuQuery antExChuQuery1 = new AntExChuQuery();
841		- antExChuQuery1.setHospitalId(downQueryRequest.getCzHospitalId());
	867	+ antExChuQuery1.setHospitalList(chospitalList);
842	868	antExChuQuery1.setCheckTimeStart(DateUtil.getDayStartTime(DateUtil.parseYMD(downQueryRequest.getCzDateStart())));
843	869	antExChuQuery1.setCheckTimeEnd(DateUtil.getDayEndTime(DateUtil.parseYMD(downQueryRequest.getCzDateEnd())));
844	870	antExChuQuery1.setYn(YnEnums.YES.getId());

...	...	@@ -119,7 +119,12 @@
119	119	* @discription 分娩医院id
120	120	*/
121	121	private String hospitalId;
122		-
	122	+ //省份
	123	+ private String cprovinceId;
	124	+ //城市
	125	+ private String ccityId;
	126	+ //区域
	127	+ private String careaId;
123	128	//初诊医院
124	129	private String czHospitalId;
125	130	//初诊时间
...	...	@@ -179,6 +184,30 @@
179	184
180	185	public String getGcStatus() {
181	186	return gcStatus;
	187	+ }
	188	+
	189	+ public String getCprovinceId() {
	190	+ return cprovinceId;
	191	+ }
	192	+
	193	+ public void setCprovinceId(String cprovinceId) {
	194	+ this.cprovinceId = cprovinceId;
	195	+ }
	196	+
	197	+ public String getCcityId() {
	198	+ return ccityId;
	199	+ }
	200	+
	201	+ public void setCcityId(String ccityId) {
	202	+ this.ccityId = ccityId;
	203	+ }
	204	+
	205	+ public String getCareaId() {
	206	+ return careaId;
	207	+ }
	208	+
	209	+ public void setCareaId(String careaId) {
	210	+ this.careaId = careaId;
182	211	}
183	212
184	213	public void setGcStatus(String gcStatus) {

...	...	@@ -15,6 +15,12 @@
15	15	* @since BME V100R001C40B104
16	16	*/
17	17	public class TrackDownQueryRequest extends BasePageQueryRequest {
	18	+ //省份
	19	+ private String cprovinceId;
	20	+ //城市
	21	+ private String ccityId;
	22	+ //区域
	23	+ private String careaId;
18	24	//初诊医院
19	25	private String czHospitalId;
20	26	//初诊时间
...	...	@@ -168,6 +174,30 @@
168	174
169	175	public String getCzDateEnd() {
170	176	return czDateEnd;
	177	+ }
	178	+
	179	+ public String getCprovinceId() {
	180	+ return cprovinceId;
	181	+ }
	182	+
	183	+ public void setCprovinceId(String cprovinceId) {
	184	+ this.cprovinceId = cprovinceId;
	185	+ }
	186	+
	187	+ public String getCcityId() {
	188	+ return ccityId;
	189	+ }
	190	+
	191	+ public void setCcityId(String ccityId) {
	192	+ this.ccityId = ccityId;
	193	+ }
	194	+
	195	+ public String getCareaId() {
	196	+ return careaId;
	197	+ }
	198	+
	199	+ public void setCareaId(String careaId) {
	200	+ this.careaId = careaId;
171	201	}
172	202
173	203	public void setCzDateEnd(String czDateEnd) {