jiangjiazhi / regional-platform

Commit 673f7f4d506f8b65c31ae935c0d9db8d64247440

Authored by litao@lymsh.com almost 8 years ago

Exists in master and in 6 other branches

修复

Showing 2 changed files with 30 additions and 0 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java

...	...	@@ -32,6 +32,13 @@
32	32	return UUID.randomUUID().toString().replace("-", "").toUpperCase();
33	33	}
34	34
	35	+ //首字母大写
	36	+ public static String captureName(String name) {
	37	+ char[] cs = name.toCharArray();
	38	+ cs[0] -= 32;
	39	+ return String.valueOf(cs);
	40	+ }
	41	+
35	42	public static String dueWeek(int days) {
36	43	if (days >= 294) {
37	44	return "已分娩";

...	...	@@ -15,6 +15,7 @@
15	15	import com.lyms.platform.operate.web.service.BabyEyeCheckService;
16	16	import com.lyms.platform.operate.web.utils.CollectionUtils;
17	17	import com.lyms.platform.operate.web.utils.MongoUtil;
	18	+import com.lyms.platform.operate.web.utils.ReflectUtil;
18	19	import com.lyms.platform.operate.web.utils.ResponseUtil;
19	20	import com.lyms.platform.permission.dao.master.BabyEyeCheckMapper;
20	21	import com.lyms.platform.permission.dao.master.CouponMapper;
...	...	@@ -211,6 +212,14 @@
211	212	query.with(new Sort(Sort.Direction.DESC, "checkTime"));
212	213	List<BabyEyeCheck> babyEyeChecks = mongoTemplate.find(query, BabyEyeCheck.class);
213	214	doFilter(babyEyeChecks);
	215	+
	216	+ if(StringUtils.isNotEmpty(positiveIds)) {
	217	+ List<String> ids = CollectionUtils.asList(positiveIds, String.class);
	218	+ if(CollectionUtils.isNotEmpty(ids)) {
	219	+ doFilter(babyEyeChecks, ids);
	220	+ }
	221	+ }
	222	+
214	223	Integer count = babyEyeChecks.size();
215	224
216	225	List<BabyEyeCheck> datas = CollectionUtils.getPageIds(babyEyeChecks, page, limit);
...	...	@@ -221,6 +230,20 @@
221	230	List<BabyEyeCheck> babyEyeChecks = (List<BabyEyeCheck>) pageResult.getGrid();
222	231	pageResult.setGrid(setDatas(babyEyeChecks));
223	232	return RespBuilder.buildSuccess(pageResult);
	233	+ }
	234	+
	235	+ private void doFilter(List<BabyEyeCheck> babyEyeChecks, List<String> ids) {
	236	+ Iterator<BabyEyeCheck> iterator = babyEyeChecks.iterator();
	237	+ while (iterator.hasNext()) {
	238	+ BabyEyeCheck babyEyeCheck = iterator.next();
	239	+ for (String id : ids) {
	240	+ String value = (String) ReflectUtil.invoke(babyEyeCheck, "get" + StringUtils.captureName(id));
	241	+ if(!"yang".equals(value)) {
	242	+ iterator.remove();
	243	+ return;
	244	+ }
	245	+ }
	246	+ }
224	247	}
225	248
226	249	private List<Map<String, Object>> setDatas(List<BabyEyeCheck> babyEyeChecks) {