jiangjiazhi / regional-platform

Authored by liquanyu over 3 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 45 additions and 0 deletions

...	...	@@ -217,7 +217,16 @@
217	217
218	218	//转诊
219	219	private Map<String,Object> referral;
	220	+ //温度
	221	+ private String temperature;
220	222
	223	+ public String getTemperature() {
	224	+ return temperature;
	225	+ }
	226	+
	227	+ public void setTemperature(String temperature) {
	228	+ this.temperature = temperature;
	229	+ }
221	230	public Date getOutDate() {
222	231	return outDate;
223	232	}

...	...	@@ -4752,6 +4752,7 @@
4752	4752	map.put("outDate",DateUtil.getyyyy_MM_dd( data.getOutDate()));
4753	4753	map.put("classify", data.getClassify());
4754	4754	map.put("referral", data.getReferral());
	4755	+ map.put("temperature", data.getTemperature());
4755	4756
4756	4757	br.setErrorcode(ErrorCodeConstants.SUCCESS);
4757	4758	br.setErrormsg("成功");

...	...	@@ -209,6 +209,17 @@
209	209	//转诊
210	210	private Map<String,Object> referral;
211	211
	212	+ //温度
	213	+ private String temperature;
	214	+
	215	+ public String getTemperature() {
	216	+ return temperature;
	217	+ }
	218	+
	219	+ public void setTemperature(String temperature) {
	220	+ this.temperature = temperature;
	221	+ }
	222	+
212	223	public String getOutDate() {
213	224	return outDate;
214	225	}
...	...	@@ -982,6 +993,7 @@
982	993	postReviewModel.setOutDate(DateUtil.parseYMD(outDate));
983	994	postReviewModel.setClassify(classify);
984	995	postReviewModel.setReferral(referral);
	996	+ postReviewModel.setTemperature(temperature);
985	997	return postReviewModel;
986	998	}
987	999	}

...	...	@@ -197,7 +197,16 @@
197	197
198	198	//转诊
199	199	private Map<String,Object> referral;
	200	+ //温度
	201	+ private String temperature;
200	202
	203	+ public String getTemperature() {
	204	+ return temperature;
	205	+ }
	206	+
	207	+ public void setTemperature(String temperature) {
	208	+ this.temperature = temperature;
	209	+ }
201	210	public PostReviewResult convertToResult(PostReviewModel postReviewModel) {
202	211	setZyzlState(postReviewModel.getZyzlState());
203	212	setZyzlContent(postReviewModel.getZyzlContent());
...	...	@@ -283,6 +292,7 @@
283	292	setOutDate(DateUtil.getyyyy_MM_dd(postReviewModel.getOutDate()));
284	293	setClassify(postReviewModel.getClassify());
285	294	setReferral(postReviewModel.getReferral());
	295	+ setTemperature(postReviewModel.getTemperature());
286	296	return this;
287	297	}
288	298

...	...	@@ -505,6 +505,19 @@
505	505	restMap.put("motherTelNo", newbornVisit.getMotherTelNo());
506	506	restMap.put("motherBirthDate", newbornVisit.getMotherBirthDate());
507	507
	508	+ BabyModel babyModel = babyService.getOneBabyById(newbornVisit.getBabyId());
	509	+ if (babyModel != null)
	510	+ {
	511	+ //身份证号、父亲职业电话出生日期、母亲职业出生日期、
	512	+ restMap.put("babyCardNo", babyModel.getCardNo());
	513	+ restMap.put("fproType", CommonsHelper.getName1(babyModel.getFproTypeId(),basicConfigService));
	514	+ restMap.put("fphone", babyModel.getFphone());
	515	+ restMap.put("fbirth", DateUtil.getyyyy_MM_dd(babyModel.getFbirth()));
	516	+ restMap.put("mproType", CommonsHelper.getName1(babyModel.getMproTypeId(),basicConfigService));
	517	+ restMap.put("mphone", babyModel.getMphone());
	518	+ restMap.put("mbirth", DateUtil.getyyyy_MM_dd(babyModel.getMbirth()));
	519	+ }
	520	+
508	521	return RespBuilder.buildSuccess(restMap);
509	522	}
510	523	return RespBuilder.buildSuccess();