jiangjiazhi / regional-platform

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 13 additions and 13 deletions

...	...	@@ -28,7 +28,7 @@
28	28	//手机号
29	29	private String phone;
30	30	//高危因素
31		- private String riskFactor;
	31	+ private List riskFactor;
32	32	//高危评分
33	33	private String riskScore;
34	34	//备注
...	...	@@ -48,7 +48,6 @@
48	48	setPhone(patients.getPhone());
49	49	setRemarks("产妇备注");
50	50	setRiskScore("60");
51		- setRiskFactor("高危因素");
52	51	setDueWeek("");
53	52	if(CollectionUtils.isNotEmpty(destList)){
54	53	List<MatDeliverExt> list = new ArrayList<>();
...	...	@@ -60,6 +59,10 @@
60	59	return this;
61	60	}
62	61
	62	+ public void setRiskFactor(List riskFactor) {
	63	+ this.riskFactor = riskFactor;
	64	+ }
	65	+
63	66	public Integer getAge() {
64	67	return age;
65	68	}
...	...	@@ -116,13 +119,6 @@
116	119	this.remarks = remarks;
117	120	}
118	121
119		- public String getRiskFactor() {
120		- return riskFactor;
121		- }
122		-
123		- public void setRiskFactor(String riskFactor) {
124		- this.riskFactor = riskFactor;
125		- }
126	122
127	123	public String getRiskScore() {
128	124	return riskScore;

...	...	@@ -164,7 +164,7 @@
164	164	//畸形
165	165	private Integer deformity;
166	166	//apgar评分
167		- private String apgarScore;
	167	+ private Map apgarScore;
168	168	//窒息分钟
169	169	private String asphyxiaM;
170	170	// 妊娠结局
...	...	@@ -184,7 +184,7 @@
184	184	setBabyWeight(babyModel.getBabyWeight());
185	185	setBabyHeight(babyModel.getBabyHeight());
186	186	setDeformity(babyModel.getMalformation());
187		- setApgarScore(babyModel.getApgarScore());
	187	+ setApgarScore(JsonUtil.str2Obj(babyModel.getApgarScore(),Map.class));
188	188	setAsphyxiaM(babyModel.getAsphyxiaM());
189	189	setPregnancyOut(babyModel.getPregnancyOut());
190	190	setBabyHealthy(babyModel.getBabyHealthy());
191	191
192	192
...	...	@@ -201,12 +201,16 @@
201	201	this.id = id;
202	202	}
203	203
204		- public String getApgarScore() {
	204	+ public Map getApgarScore() {
205	205	return apgarScore;
206	206	}
207	207
208		- public void setApgarScore(String apgarScore) {
	208	+ public void setApgarScore(Map apgarScore) {
209	209	this.apgarScore = apgarScore;
	210	+ }
	211	+
	212	+ public Integer getDeformity() {
	213	+ return deformity;
210	214	}
211	215
212	216	public String getAsphyxiaM() {