jiangjiazhi / regional-platform

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 49 additions and 3 deletions

...	...	@@ -95,6 +95,8 @@
95	95
96	96	private List<String> parentIds;
97	97
	98	+ private List<String> lymsSieveIds;
	99	+
98	100	private List<Integer> statuses;
99	101
100	102	/**
101	103
...	...	@@ -118,7 +120,14 @@
118	120	private String areaId;
119	121	private String streetId;
120	122
	123	+ public List<String> getLymsSieveIds() {
	124	+ return lymsSieveIds;
	125	+ }
121	126
	127	+ public void setLymsSieveIds(List<String> lymsSieveIds) {
	128	+ this.lymsSieveIds = lymsSieveIds;
	129	+ }
	130	+
122	131	public String getProvinceId() {
123	132	return provinceId;
124	133	}
...	...	@@ -419,6 +428,9 @@
419	428
420	429	if (null != parentIds && parentIds.size() > 0) {
421	430	condition = condition.and("parentId", parentIds, MongoOper.IN);
	431	+ }
	432	+ if (null != lymsSieveIds && lymsSieveIds.size() > 0) {
	433	+ condition = condition.and("id", lymsSieveIds, MongoOper.IN);
422	434	}
423	435
424	436	if (StringUtils.isNotEmpty(name)) {

...	...	@@ -127,11 +127,10 @@
127	127	@ResponseBody
128	128	@RequestMapping(value = "/reviceSieve", method = RequestMethod.POST)
129	129	@TokenRequired
130		- public BaseResponse reviceSieve(@RequestBody List<String> parentIds, HttpServletRequest request) {
	130	+ public BaseResponse reviceSieve(@RequestBody List<String> parentIds, HttpServletRequest request) {
131	131	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
132		- return sieveFacade.reviceSieve(parentIds, loginState.getId());
	132	+ return sieveFacade.reviceSieve2(parentIds, loginState.getId());
133	133	}
134		-
135	134
136	135	/**
137	136	* 产前诊断

...	...	@@ -1266,6 +1266,41 @@
1266	1266	}
1267	1267	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
1268	1268	}
	1269	+ /**
	1270	+ * 功能描述: 接收产筛申请,入参是档案id就使用以前方式
	1271	+ * @author 武涛涛
	1272	+ * @date 2020/6/10
	1273	+ */
	1274	+ public BaseResponse reviceSieve2(List<String> parentIds, Integer userId) {
	1275	+ if (CollectionUtils.isNotEmpty(parentIds)) {
	1276	+ SieveQuery query = new SieveQuery();
	1277	+ query.setLymsSieveIds(parentIds);
	1278	+ query.setYn(YnEnums.YES.getId());
	1279	+ List<SieveModel> list = sieveService.queryList(query);
	1280	+
	1281	+ if (CollectionUtils.isNotEmpty(list)) {
	1282	+ for (SieveModel sieve : list) {
	1283	+ sieve.setReviceStatus(2);
	1284	+ sieveService.updateOneChanQianDiaSieve(sieve);
	1285	+ }
	1286	+ }
	1287	+ }
	1288	+
	1289	+ if (CollectionUtils.isNotEmpty(parentIds)) {
	1290	+ SieveQuery query = new SieveQuery();
	1291	+ query.setParentIds(parentIds);
	1292	+ query.setYn(YnEnums.YES.getId());
	1293	+ List<SieveModel> list = sieveService.queryList(query);
	1294	+
	1295	+ if (CollectionUtils.isNotEmpty(list)) {
	1296	+ for (SieveModel sieve : list) {
	1297	+ sieve.setReviceStatus(2);
	1298	+ sieveService.updateOneChanQianDiaSieve(sieve);
	1299	+ }
	1300	+ }
	1301	+ }
	1302	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	1303	+ }
1269	1304
1270	1305	public BaseResponse queryCqsievesReport(CqSieveQueryRequest cqSieveQueryRequest, Integer userId) {
1271	1306	//获取用户权限医院和筛选条件的交集