jiangjiazhi / regional-platform

Commit a47c650f9519ffca69ad8d7937d4859d3fd4f895

Authored by wtt almost 5 years ago

Exists in master and in 6 other branches

update

Showing 2 changed files with 75 additions and 40 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java

...	...	@@ -155,21 +155,6 @@
155	155	currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit,
156	156	bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin,noPassIds);
157	157	}
158		- /**
159		- * 儿童眼保健管理,检查次数展示也就是以前的“眼保健管理”
160		- *
161		- * @Author: 武涛涛
162		- * @Date: 2020/8/3 14:09
163		- */
164		- @ResponseBody
165		- @TokenRequired
166		- @RequestMapping(value = "/checkList", method = RequestMethod.GET)
167		- public BaseResponse checkList(Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, HttpServletRequest request,
168		- Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin,String noPassIds) {
169		- return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key,
170		- currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit,
171		- bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin,noPassIds);
172		- }
173	158
174	159	/**
175	160	* 眼保健管理,按照儿童档案次数展示

...	...	@@ -925,33 +925,11 @@
925	925	}
926	926
927	927	/**
928		- * 新加的不通过查询条件
	928	+ * 新加的不通过查询条件和阳性项目处理
929	929	* @Author: 武涛涛
930		- * @Date: 2020/7/21 21:56
	930	+ * @Date: 2020/8/05 21:56
931	931	*/
932		- if (StringUtils.isNotEmpty(noPassIds)) {
933		- List<String> ids = CollectionUtils.asList(noPassIds, String.class);
934		- for (String id : ids) {
935		- if ("eyeAppearance".equals(id)) {
936		- criteria.and("eyeAppearance").is("2");
937		- } else if ("redReflexQhd".equals(id)) {
938		- criteria.and("redReflexQhd").is("2");
939		- } else if ("blinkReflex".equals(id)) {
940		- criteria.and("blinkReflex").is("2");
941		- } else if ("redBallTest".equals(id)) {
942		- criteria.and("redBallTest").is("2");
943		- } else if ("behaviorObservation".equals(id)) {
944		- criteria.and("behaviorObservation").is("2");
945		- } else if ("refractiveScreening".equals(id)) {
946		- criteria.and("refractiveScreening").is("2");
947		- } else if ("eyePositionExamination".equals(id)) {
948		- criteria.and("eyePositionExamination").is("2");
949		- } else if ("eyeMovement".equals(id)) {
950		- criteria.and("eyeMovement").is("2");
951		- }
952		- }
953		- }
954		-
	932	+ yangXingTongGuo(positiveIds, noPassIds, criteria);
955	933	/end /
956	934	List<String> babyIds = new ArrayList<>();
957	935	//存放，没有在眼保健建档或在眼保健建档，做个眼保健检查的档案。
...	...	@@ -1052,6 +1030,78 @@
1052	1030	objectResponse.setPageInfo(babyModelQuery.getPageInfo());
1053	1031	objectResponse.setErrormsg("成功");
1054	1032	return objectResponse;
	1033	+ }
	1034	+
	1035	+ private void yangXingTongGuo(String positiveIds, String noPassIds, Criteria criteria) {
	1036	+ if (StringUtils.isNotEmpty(noPassIds)) {
	1037	+ List<String> ids = CollectionUtils.asList(noPassIds, String.class);
	1038	+ for (String id : ids) {
	1039	+ if ("eyeAppearance".equals(id)) {
	1040	+ criteria.and("eyeAppearance").is("2");
	1041	+ } else if ("redReflexQhd".equals(id)) {
	1042	+ criteria.and("redReflexQhd").is("2");
	1043	+ } else if ("blinkReflex".equals(id)) {
	1044	+ criteria.and("blinkReflex").is("2");
	1045	+ } else if ("redBallTest".equals(id)) {
	1046	+ criteria.and("redBallTest").is("2");
	1047	+ } else if ("behaviorObservation".equals(id)) {
	1048	+ criteria.and("behaviorObservation").is("2");
	1049	+ } else if ("refractiveScreening".equals(id)) {
	1050	+ criteria.and("refractiveScreening").is("2");
	1051	+ } else if ("eyePositionExamination".equals(id)) {
	1052	+ criteria.and("eyePositionExamination").is("2");
	1053	+ } else if ("eyeMovement".equals(id)) {
	1054	+ criteria.and("eyeMovement").is("2");
	1055	+ }
	1056	+ }
	1057	+ }
	1058	+ if (StringUtils.isNotEmpty(positiveIds)) {
	1059	+ List<String> ids = CollectionUtils.asList(positiveIds, String.class);
	1060	+ if (CollectionUtils.isNotEmpty(ids)) {
	1061	+ for (String id : ids) {
	1062	+ if ("extEyelook".equals(id)) {
	1063	+ criteria.and("extEyelook").is("yang");
	1064	+ } else if ("nystagmus".equals(id)) {
	1065	+ criteria.and("nystagmus").is("yang");
	1066	+ } else if ("extRightEyelook".equals(id)) {
	1067	+ criteria.and("extRightEyelook").is("yang");
	1068	+ } else if ("extLeftEyelook".equals(id)) {
	1069	+ criteria.and("extLeftEyelook").is("yang");
	1070	+ } else if ("blinkRightReflex".equals(id)) {
	1071	+ criteria.and("blinkRightReflex").is("yang");
	1072	+ } else if ("blinkLefttReflex".equals(id)) {
	1073	+ criteria.and("blinkLefttReflex").is("yang");
	1074	+ } else if ("pupillaryRightReflex".equals(id)) {
	1075	+ criteria.and("pupillaryRightReflex").is("yang");
	1076	+ } else if ("pupillaryLeftReflex".equals(id)) {
	1077	+ criteria.and("pupillaryLeftReflex").is("yang");
	1078	+ }else if ("redRightReflex".equals(id)) {
	1079	+ criteria.and("redRightReflex").is("yang");
	1080	+ }else if ("redLeftReflex".equals(id)) {
	1081	+ criteria.and("redLeftReflex").is("yang");
	1082	+ }else if ("redReflex".equals(id)) {
	1083	+ criteria.and("redReflex").is("yang");
	1084	+ }else if ("conjunctiva".equals(id)) {
	1085	+ criteria.and("conjunctiva").is("yang");
	1086	+ }else if ("corneal".equals(id)) {
	1087	+ criteria.and("corneal").is("yang");
	1088	+ }else if ("lacrimalApparatus".equals(id)) {
	1089	+ criteria.and("lacrimalApparatus").is("yang");
	1090	+ }else if ("eyePositionId2".equals(id)) {
	1091	+ criteria.and("eyePositionId2").is("yang");
	1092	+ }else if ("redLeft2".equals(id)) {
	1093	+ criteria.and("redLeft2").is("yang");
	1094	+ }else if ("vision2".equals(id)) {
	1095	+ criteria.and("vision2").is("yang");
	1096	+ }else if ("y2".equals(id)) {
	1097	+ criteria.and("y2").is("yang");
	1098	+ }else if ("refraction2".equals(id)) {
	1099	+ criteria.and("ss").is("refraction2");
	1100	+ }
	1101	+
	1102	+ }
	1103	+ }
	1104	+ }
1055	1105	}
1056	1106
1057	1107	private void doFilter(List<BabyEyeCheck> babyEyeChecks, List<String> ids) {