jiangjiazhi / regional-platform

Commit d11620d09cfda1ecc3067f51fc7118de2e3dc62b

Authored by [wangbo] over 6 years ago

Exists in master and in 6 other branches

无创报告类型修改

Showing 4 changed files with 52 additions and 30 deletions

platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java

...	...	@@ -610,11 +610,12 @@
610	610	if ("1".equals(reportType)) {
611	611	MongoCondition c = MongoCondition.newInstance();
612	612	MongoCondition con1 = MongoCondition.newInstance("reportType", reportType, MongoOper.IS);
613		- MongoCondition con2 = MongoCondition.newInstance("reportType", false, MongoOper.EXISTS);
	613	+ // MongoCondition con2 = MongoCondition.newInstance("reportType", false, MongoOper.EXISTS);
	614	+ MongoCondition con3 = MongoCondition.newInstance("sieveType", 2, MongoOper.IS);
614	615	if (c1 != null) {
615		- c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
	616	+ c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con3}).getCriteria());
616	617	} else {
617		- c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
	618	+ c1 = c.orCondition(new MongoCondition[]{con1, con3}).getCriteria();
618	619	}
619	620	}
620	621	// reportType = 2/重取 3/失败

...	...	@@ -338,8 +338,8 @@
338	338	// TODO 2019/8/26 18:11 dongqing
339	339
340	340	@RequestMapping(value = "/sieveHistory", method = RequestMethod.GET)
341		- public void SieveHistory(Date startTime, Date endTime, String hospital) {
342		- sieveFacade.SieveHistory(startTime, endTime, hospital);
	341	+ public void SieveHistory(Date startTime, Date endTime, String hospital, String provinceId, String cityId, String areaId) {
	342	+ sieveFacade.SieveHistory(startTime, endTime, hospital, provinceId, cityId, areaId);
343	343	}
344	344
345	345

...	...	@@ -544,7 +544,6 @@
544	544
545	545	//查询产筛list
546	546	List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
547		-
548	547	int batchSize = 4;
549	548	int end = 0;
550	549	List<Future> listFuture = new ArrayList<>();
551	550
...	...	@@ -2178,29 +2177,53 @@
2178	2177	list.add(dataMap);
2179	2178	}
2180	2179
2181		- public void SieveHistory(Date startTime, Date endTime, String hospitalId) {
2182		- SieveQuery sieveQuery = new SieveQuery();
2183		- sieveQuery.setHospitalId(hospitalId);
2184		- if (null != startTime && null != endTime) {
2185		- sieveQuery.setCreatedStart(startTime);
2186		- sieveQuery.setCreatedEnd(endTime);
2187		- }
2188		- List<SieveModel> sieveQuery1 = sieveService.queryList(sieveQuery);
2189		- System.out.println("条数" + sieveQuery1.size());
2190		- if (CollectionUtils.isNotEmpty(sieveQuery1)) {
2191		- int batchSize = 100;
2192		- int ends = 0;
2193		- List<Future> futures = new ArrayList<>();
2194		- for (int i = 0; i < sieveQuery1.size(); i += batchSize) {
2195		- ends = (ends + batchSize);
2196		- if (ends > sieveQuery1.size()) {
2197		- ends = sieveQuery1.size();
	2180	+ public void SieveHistory(Date startTime, Date endTime, String hospitalId, String provinceId, String cityId, String areaId) {
	2181	+ List<String> orgHospitalList = new ArrayList<>();
	2182	+ if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(provinceId)) {
	2183	+ OrganizationQuery organizationQuery = new OrganizationQuery();
	2184	+ organizationQuery.setYn(YnEnums.YES.getId());
	2185	+
	2186	+ organizationQuery.setProvinceId(provinceId);
	2187	+ if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(cityId)) {
	2188	+ organizationQuery.setCityId(cityId);
	2189	+ if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(areaId)) {
	2190	+ organizationQuery.setAreaId(areaId);
2198	2191	}
2199		- List<SieveModel> mlist = sieveQuery1.subList(i, ends);
2200		- Callable c = new SieveHistory(mlist, patientsService, sieveService);
2201		- Future f = commonThreadPool.submit(c);
2202		- if (f != null) {
2203		- futures.add(f);
	2192	+ }
	2193	+ List<Organization> organizations = organizationService.queryOrganization(organizationQuery);
	2194	+ if (CollectionUtils.isNotEmpty(organizations)) {
	2195	+ for (Organization org : organizations) {
	2196	+ if (null != org.getId()) {
	2197	+ orgHospitalList.add(org.getId() + "");
	2198	+ }
	2199	+ }
	2200	+ }
	2201	+ SieveQuery sieveQuery = new SieveQuery();
	2202	+ if (StringUtils.isNotEmpty(hospitalId)) {
	2203	+ sieveQuery.setHospitalId(hospitalId);
	2204	+ } else if (null != startTime && null != endTime) {
	2205	+ sieveQuery.setCreatedStart(startTime);
	2206	+ sieveQuery.setCreatedEnd(endTime);
	2207	+ } else if (CollectionUtils.isNotEmpty(organizations)) {
	2208	+ sieveQuery.setHospitalIds(orgHospitalList);
	2209	+ }
	2210	+
	2211	+ List<SieveModel> sieveQuery1 = sieveService.queryList(sieveQuery);
	2212	+ if (CollectionUtils.isNotEmpty(sieveQuery1)) {
	2213	+ int batchSize = 100;
	2214	+ int ends = 0;
	2215	+ List<Future> futures = new ArrayList<>();
	2216	+ for (int i = 0; i < sieveQuery1.size(); i += batchSize) {
	2217	+ ends = (ends + batchSize);
	2218	+ if (ends > sieveQuery1.size()) {
	2219	+ ends = sieveQuery1.size();
	2220	+ }
	2221	+ List<SieveModel> mlist = sieveQuery1.subList(i, ends);
	2222	+ Callable c = new SieveHistory(mlist, patientsService, sieveService);
	2223	+ Future f = commonThreadPool.submit(c);
	2224	+ if (f != null) {
	2225	+ futures.add(f);
	2226	+ }
2204	2227	}
2205	2228	}
2206	2229	/*if (CollectionUtils.isNotEmpty(futures)) {

...	...	@@ -109,8 +109,6 @@
109	109	}
110	110	Map<String, Object> basicsInfo = new HashMap<>();
111	111	basicsInfo.put("basicsInfo", volumeComponentAnalysisModel);
112		-
113		-
114	112	}
115	113
116	114	return null;