jiangjiazhi / regional-platform

Authored by shiyang almost 4 years ago

Exists in master and in 6 other branches

Showing 6 changed files with 74 additions and 1 deletions

...	...	@@ -608,6 +608,22 @@
608	608	//检查医生
609	609	private String deafnessCheckDoctor;
610	610
	611	+ /**
	612	+ * 围场-儿童建档和儿童体检添加字段
	613	+ */
	614	+ //儿童高危-其它高危
	615	+ private String wcOtherHighRisk;
	616	+
	617	+ public String getWcOtherHighRisk() {
	618	+ return wcOtherHighRisk;
	619	+ }
	620	+
	621	+ public void setWcOtherHighRisk(String wcOtherHighRisk) {
	622	+ this.wcOtherHighRisk = wcOtherHighRisk;
	623	+ }
	624	+
	625	+ /********************************************/
	626	+
611	627	public Integer getDeafnessGene() {
612	628	return deafnessGene;
613	629	}

...	...	@@ -373,6 +373,22 @@
373	373	private Integer dueWeekEnd;
374	374	private Boolean existSource;
375	375
	376	+ /**
	377	+ * 围场-儿童建档和儿童体检添加字段
	378	+ */
	379	+ //儿童高危-其它高危
	380	+ private String wcOtherHighRisk;
	381	+
	382	+ public String getWcOtherHighRisk() {
	383	+ return wcOtherHighRisk;
	384	+ }
	385	+
	386	+ public void setWcOtherHighRisk(String wcOtherHighRisk) {
	387	+ this.wcOtherHighRisk = wcOtherHighRisk;
	388	+ }
	389	+
	390	+ /********************************************/
	391	+
376	392	public Boolean getExistSource() {
377	393	return existSource;
378	394	}

...	...	@@ -1542,6 +1542,10 @@
1542	1542	bm.setOpenDisease(b.getOpenDisease());
1543	1543	bm.setOpenDiseaseType(b.getOpenDiseaseType());
1544	1544	Date endTime = null;
	1545	+
	1546	+ //围场-儿童建档-儿童高危-其它高危
	1547	+ bm.setWcOtherHighRisk(b.getWcOtherHighRisk());
	1548	+
1545	1549	if (b.getOpenDiseaseType() != null) {
1546	1550	endTime = "1".equals(bm.getOpenDiseaseType()) ? DateUtil.addDay(bm.getBuildDate(), 33) : DateUtil.addMonth(bm.getBuildDate(), Integer.parseInt(b.getOpenDiseaseType()));
1547	1551	}

...	...	@@ -5578,7 +5578,6 @@
5578	5578	/** 优惠券编号 */
5579	5579	result.setCouponCode(couponService.findByUsedId(id));
5580	5580
5581		-
5582	5581	BaseObjectResponse objectResponse = new BaseObjectResponse();
5583	5582	objectResponse.setData(result);
5584	5583	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);

...	...	@@ -404,6 +404,22 @@
404	404	//儿童疾病
405	405	private List<String> diseases;
406	406
	407	+ /**
	408	+ * 围场-儿童建档和儿童体检添加字段
	409	+ */
	410	+ //儿童高危-其它高危
	411	+ private String wcOtherHighRisk;
	412	+
	413	+ public String getWcOtherHighRisk() {
	414	+ return wcOtherHighRisk;
	415	+ }
	416	+
	417	+ public void setWcOtherHighRisk(String wcOtherHighRisk) {
	418	+ this.wcOtherHighRisk = wcOtherHighRisk;
	419	+ }
	420	+
	421	+ /********************************************/
	422	+
407	423	public List<String> getDiseases() {
408	424	return diseases;
409	425	}

...	...	@@ -339,6 +339,22 @@
339	339
340	340	private String diseases;
341	341
	342	+ /**
	343	+ * 围场-儿童建档和儿童体检添加字段
	344	+ */
	345	+ //儿童高危-其它高危
	346	+ private String wcOtherHighRisk;
	347	+
	348	+ public String getWcOtherHighRisk() {
	349	+ return wcOtherHighRisk;
	350	+ }
	351	+
	352	+ public void setWcOtherHighRisk(String wcOtherHighRisk) {
	353	+ this.wcOtherHighRisk = wcOtherHighRisk;
	354	+ }
	355	+
	356	+ /********************************************/
	357	+
342	358	public String getDiseases() {
343	359	return diseases;
344	360	}
...	...	@@ -1474,6 +1490,12 @@
1474	1490	setOpenDisease((StringUtils.isEmpty(destModel.getOpenDisease()) \|\| "1".equals(destModel.getOpenDisease())) ? "未开通" : "已开通");
1475	1491	setOpenDiseaseType(StringUtils.isEmpty(destModel.getOpenDiseaseType()) ? "" : "1".equals(destModel.getOpenDiseaseType()) ? "一个月" : "一年");
1476	1492	setOpenDiseaseEndTime(destModel.getOpenDiseaseEndTime() == null ? "" : DateUtil.getyyyy_MM_dd(destModel.getOpenDiseaseEndTime()) );
	1493	+ //围场-儿童建档和儿童体检添加字段
	1494	+ if (StringUtils.isNotEmpty(destModel.getWcOtherHighRisk()))
	1495	+ {
	1496	+ setWcOtherHighRisk(destModel.getWcOtherHighRisk());
	1497	+ }
	1498	+
1477	1499	return this;
1478	1500	}
1479	1501