jiangjiazhi / regional-platform

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 34 additions and 0 deletions

...	...	@@ -1457,6 +1457,18 @@
1457	1457	* 当前月龄筛选-结束(业务模块接收字段)
1458	1458	*/
1459	1459	private Integer lhQueryEyeMonthAgeEnd;
	1460	+ /**
	1461	+ * 从阳到正常（业务处理，筛选用） 1：需要筛选
	1462	+ */
	1463	+ private Integer lhmasculineToNormal;
	1464	+
	1465	+ public Integer getLhmasculineToNormal() {
	1466	+ return lhmasculineToNormal;
	1467	+ }
	1468	+
	1469	+ public void setLhmasculineToNormal(Integer lhmasculineToNormal) {
	1470	+ this.lhmasculineToNormal = lhmasculineToNormal;
	1471	+ }
1460	1472
1461	1473	public String getYcsz() {
1462	1474	return ycsz;

...	...	@@ -115,6 +115,10 @@
115	115	* 眼高危
116	116	*/
117	117	private List<String> eyeHighRisk;
	118	+ /**
	119	+ * 从阳到正常（业务处理，筛选用）1：需要筛选
	120	+ */
	121	+ private Integer masculineToNormal;
118	122
119	123
120	124
...	...	@@ -227,6 +231,14 @@
227	231
228	232	public void setChuPositiveType(String chuPositiveType) {
229	233	this.chuPositiveType = chuPositiveType;
	234	+ }
	235	+
	236	+ public Integer getMasculineToNormal() {
	237	+ return masculineToNormal;
	238	+ }
	239	+
	240	+ public void setMasculineToNormal(Integer masculineToNormal) {
	241	+ this.masculineToNormal = masculineToNormal;
230	242	}
231	243
232	244	public String getId() {

...	...	@@ -257,6 +257,11 @@
257	257	request.setBirthStart(DateUtil.getBirthStart(request.getQueryMonthAgeEnd()));
258	258	request.setBirthEnd(DateUtil.getBirthEnd(request.getQueryMonthAgeStart()));
259	259	}
	260	+ //从阳到正常 1：需要筛选
	261	+ if(1==request.getMasculineToNormal()){
	262	+ request.setChuPositiveType("2");
	263	+ request.setPositiveType("1");
	264	+ }
260	265	List<LhBabyEyeCheck> babyOralChecks=lhBabyEyeCheckService.queryList(request,Sort.Direction.DESC,"eyeCheckTime");
261	266	List<Map> result=new ArrayList<>();
262	267	for (LhBabyEyeCheck babyCheck : babyOralChecks) {
...	...	@@ -290,6 +295,11 @@
290	295	if(babyModelQuery.getLhQueryEyeMonthAgeStart()!=null && babyModelQuery.getLhQueryEyeMonthAgeEnd()!=null){
291	296	babyModelQuery.setBirthStart(DateUtil.getBirthStart(babyModelQuery.getLhQueryEyeMonthAgeEnd()));
292	297	babyModelQuery.setBirthEnd(DateUtil.getBirthEnd(babyModelQuery.getLhQueryEyeMonthAgeStart()));
	298	+ }
	299	+ //从阳到正常 1：需要筛选
	300	+ if(1==babyModelQuery.getLhmasculineToNormal()){
	301	+ babyModelQuery.setLhChuEyePositiveType("2");
	302	+ babyModelQuery.setLhEyePositiveType("1");
293	303	}
294	304	List<BabyModel> babyModelList = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery, "lhEyeCheckTime", Sort.Direction.DESC);
295	305	List<Map> result=new ArrayList<>();