jiangjiazhi / regional-platform

Commit e0f783ea7eb08003e928c2926834f5b5b151d0a3

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

产筛

Showing 3 changed files with 61 additions and 2 deletions

platform-dal/src/main/java/com/lyms/platform/query/SieveApplyOrderQuery.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/request/CqSieveQueryRequest.java

...	...	@@ -20,6 +20,27 @@
20	20	private String id;
21	21	private String hospitalId;
22	22
	23	+ private String number;
	24	+
	25	+ //产筛医院
	26	+ private String sieveHospitalId;
	27	+
	28	+ public String getNumber() {
	29	+ return number;
	30	+ }
	31	+
	32	+ public void setNumber(String number) {
	33	+ this.number = number;
	34	+ }
	35	+
	36	+ public String getSieveHospitalId() {
	37	+ return sieveHospitalId;
	38	+ }
	39	+
	40	+ public void setSieveHospitalId(String sieveHospitalId) {
	41	+ this.sieveHospitalId = sieveHospitalId;
	42	+ }
	43	+
23	44	public String getHospitalId() {
24	45	return hospitalId;
25	46	}
...	...	@@ -60,6 +81,9 @@
60	81	}
61	82	if(null!=hospitalId){
62	83	condition= condition.and("hospitalId",hospitalId, MongoOper.IS);
	84	+ }
	85	+ if(null!=sieveHospitalId){
	86	+ condition= condition.and("sieveHospitalId",sieveHospitalId, MongoOper.IS);
63	87	}
64	88	if(null!=yn){
65	89	condition= condition.and("yn",yn, MongoOper.IS);

...	...	@@ -340,7 +340,7 @@
340	340	* @return
341	341	*/
342	342	public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, String needPage,boolean isSieveLagManage) {
343		-
	343	+ List<SieveListResult> data = new ArrayList<>();
344	344	SieveQuery sieveQuery = new SieveQuery();
345	345	sieveQuery.setQueryNo(cqSieveQueryRequest.getQueryNo());
346	346	sieveQuery.setYn(YnEnums.YES.getId());
347	347
...	...	@@ -408,10 +408,34 @@
408	408	sieveQuery.setHospitalId(hospitalId);
409	409	}
410	410
	411	+ if (StringUtils.isNotEmpty(cqSieveQueryRequest.getNumber()))
	412	+ {
	413	+ List<String> parentIds = new ArrayList<>();
	414	+ SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
	415	+ sieveApplyOrderQuery.setSieveHospitalId(hospitalId);
	416	+ sieveApplyOrderQuery.setNumber(cqSieveQueryRequest.getNumber());
	417	+ sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
	418	+ List<SieveApplyOrderModel> sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery);
	419	+ if (CollectionUtils.isNotEmpty(sieveApplyOrderModels))
	420	+ {
	421	+ for(SieveApplyOrderModel model : sieveApplyOrderModels)
	422	+ {
	423	+ parentIds.add(model.getParentId());
	424	+ }
	425	+ }
	426	+ if (CollectionUtils.isNotEmpty(parentIds))
	427	+ {
	428	+ sieveQuery.setParentIds(parentIds);
	429	+ }
	430	+ else
	431	+ {
	432	+ return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(sieveQuery.getPageInfo());
	433	+ }
	434	+ }
411	435
412	436	//查询产筛list
413	437	List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
414		- List<SieveListResult> data = new ArrayList<>();
	438	+
415	439	int batchSize = 4;
416	440	int end = 0;
417	441	List<Future> listFuture = new ArrayList<>();

...	...	@@ -60,6 +60,17 @@
60	60	//申请医院
61	61	private String applyHospitalId;
62	62
	63	+ //标本号
	64	+ private String number;
	65	+
	66	+ public String getNumber() {
	67	+ return number;
	68	+ }
	69	+
	70	+ public void setNumber(String number) {
	71	+ this.number = number;
	72	+ }
	73	+
63	74	public String getApplyHospitalId() {
64	75	return applyHospitalId;
65	76	}