jiangjiazhi / regional-platform

Authored by wangbo almost 7 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 4 additions and 28 deletions

...	...	@@ -24,10 +24,6 @@
24	24	private String ssy;
25	25	// 脉搏
26	26	private Integer pulse;
27		-
28		- // 前囟单胎/双胎/多胎
29		- private String bregmatic;
30		-
31	27	private String hospitalId;
32	28
33	29	private Integer yn;
...	...	@@ -92,13 +88,6 @@
92	88	this.pulse = pulse;
93	89	}
94	90
95		- public String getBregmatic() {
96		- return bregmatic;
97		- }
98		-
99		- public void setBregmatic(String bregmatic) {
100		- this.bregmatic = bregmatic;
101		- }
102	91
103	92	public String getId() {
104	93	return id;

...	...	@@ -42,10 +42,6 @@
42	42
43	43	private Map<String, String> dayWeights;
44	44
45		-
46		- // 前囟单胎/双胎/多胎
47		- private String bregmatic;
48		-
49	45	private String hospitalId;
50	46	//报告状态 1未查看 2查看
51	47	private Integer status;
...	...	@@ -69,14 +65,6 @@
69	65	this.hospitalId = hospitalId;
70	66	}
71	67
72		-
73		- public String getBregmatic() {
74		- return bregmatic;
75		- }
76		-
77		- public void setBregmatic(String bregmatic) {
78		- this.bregmatic = bregmatic;
79		- }
80	68
81	69	public Map<String, String> getDayWeights() {
82	70	return dayWeights;

...	...	@@ -24,8 +24,7 @@
24	24	@ResponseBody
25	25	@RequestMapping(value = "/addAndUpdate", method = RequestMethod.POST)
26	26	@TokenRequired
27		- //@Valid @RequestBody
28		- public BaseResponse addAndUpdate( TemporaryUserModel temporaryUser, HttpServletRequest request) {
	27	+ public BaseResponse addAndUpdate(@Valid @RequestBody TemporaryUserModel temporaryUser, HttpServletRequest request) {
29	28	return temporaryUserService.addAndUpdate(temporaryUser, getUserId(request));
30	29
31	30	}

...	...	@@ -214,7 +214,7 @@
214	214	temp.put("beforWeight", temporaryUser.getBeforeWeight() == null ? "" : temporaryUser.getBeforeWeight());
215	215	temp.put("weight", bloodPressure.getNowWeight() == null ? "" : bloodPressure.getNowWeight());
216	216	temp.put("height", temporaryUser.getBeforeHeight() == null ? "" : temporaryUser.getBeforeHeight());
217		- temp.put("bregmatic", bloodPressure.getBregmatic() == null ? "" : bloodPressure.getBregmatic());
	217	+ temp.put("bregmatic", temporaryUser.getBregmatic() == null ? "" : temporaryUser.getBregmatic());
218	218	}
219	219	restList.add(temp);
220	220	}

...	...	@@ -210,7 +210,7 @@
210	210	temp.put("bloodSugarType", BloodSugarEnums.getName(bloodSugar.getBloodSugarType()));
211	211	temp.put("bloodSugarId", bloodSugar.getBloodSugarType());
212	212	temp.put("status", getBloodSugarStatus(bloodSugar.getBloodSugarType(), bloodSugar.getBloodSugar()));
213		- temp.put("bregmatic", bloodSugar.getBregmatic());
	213	+ temp.put("bregmatic", temporaryUser.getBregmatic());
214	214	temp.put("cardNo", temporaryUser.getCardID());
215	215	}
216	216	restList.add(temp);
...	...	@@ -357,7 +357,7 @@
357	357	double bmi = Double.parseDouble(bmiStr);
358	358	//根据高危获取不同的卡路里计算公式
359	359	Map<String, String> kmap = computeKulServiceManager.getComputeKulByRisk(rid).getComputeKul(Double.parseDouble(temporaryUser.getBeforeWeight()),
360		- Double.parseDouble(bloodSugar.getNowWeight()), week, bmi, bloodSugar.getBregmatic(), temporaryUser.getBeforeHeight());
	360	+ Double.parseDouble(bloodSugar.getNowWeight()), week, bmi, temporaryUser.getBregmatic(), temporaryUser.getBeforeHeight());
361	361
362	362
363	363	String weekYyzl = "";