jiangjiazhi / regional-platform

Commit 0c1229fe930d4c9c312a2246d3db45e33dcc0246

Authored by liquanyu about 5 years ago

Exists in master and in 6 other branches

大同档案增加字段

Showing 4 changed files with 27 additions and 15 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java

...	...	@@ -346,7 +346,7 @@
346	346	private Integer marriageCheck;
347	347
348	348	//避孕方式 1 未避孕 2口服避孕药 3避孕套 4避孕膜 5其他
349		- private List<Map<String,Boolean>> contraceptionType;
	349	+ private Map<String,Boolean> contraceptionType;
350	350	private String contraceptionOther;
351	351
352	352	//丈夫婚姻状态 1初婚 2 再婚 3其他
...	...	@@ -361,6 +361,9 @@
361	361	//吸烟数量
362	362	private String smokeNum;
363	363
	364	+ //丈夫
	365	+ private Integer hmarriageAge;
	366	+
364	367	//饮酒 1偶尔 2 经常 3否
365	368	private Integer drinkWine;
366	369
...	...	@@ -376,6 +379,14 @@
376	379	//其他
377	380	private String other;
378	381
	382	+ public Integer getHmarriageAge() {
	383	+ return hmarriageAge;
	384	+ }
	385	+
	386	+ public void setHmarriageAge(Integer hmarriageAge) {
	387	+ this.hmarriageAge = hmarriageAge;
	388	+ }
	389	+
379	390	public Integer getMarriageAge() {
380	391	return marriageAge;
381	392	}
382	393
...	...	@@ -408,11 +419,11 @@
408	419	this.marriageCheck = marriageCheck;
409	420	}
410	421
411		- public List<Map<String,Boolean>> getContraceptionType() {
	422	+ public Map<String,Boolean> getContraceptionType() {
412	423	return contraceptionType;
413	424	}
414	425
415		- public void setContraceptionType(List<Map<String,Boolean>> contraceptionType) {
	426	+ public void setContraceptionType( Map<String,Boolean> contraceptionType) {
416	427	this.contraceptionType = contraceptionType;
417	428	}
418	429

...	...	@@ -480,14 +480,14 @@
480	480	map.put("marriageStatus",data.getMarriageStatus() == null ? "" : data.getMarriageStatus() == 1 ? "初婚" : (data.getMarriageStatus() == 2 ? "再婚" : "其他"));
481	481	map.put("marriageCheck",data.getMarriageCheck() == null ? "" : data.getMarriageCheck() == 1 ? "是" : "否");
482	482	StringBuilder sb = new StringBuilder();
483		- if (data.getContraceptionType() != null)
	483	+ if (data.getContraceptionType() != null && data.getContraceptionType().size() > 0)
484	484	{
485	485
486		- sb.append(data.getContraceptionType().get(0).get("wby") == true ? "未避孕 " : "");
487		- sb.append(data.getContraceptionType().get(1).get("kfbyy") == true ? "口服避孕药 " : "");
488		- sb.append(data.getContraceptionType().get(2).get("byt") == true ? "避孕套 " : "");
489		- sb.append(data.getContraceptionType().get(3).get("bym") == true ? "避孕膜 " : "");
490		- sb.append(data.getContraceptionType().get(4).get("qt") == true ? data.getContraceptionOther()+" " : "");
	486	+ sb.append(data.getContraceptionType().get("wby") == true ? "未避孕 " : "");
	487	+ sb.append(data.getContraceptionType().get("kfbyy") == true ? "口服避孕药 " : "");
	488	+ sb.append(data.getContraceptionType().get("byt") == true ? "避孕套 " : "");
	489	+ sb.append(data.getContraceptionType().get("bym") == true ? "避孕膜 " : "");
	490	+ sb.append(data.getContraceptionType().get("qt") == true ? data.getContraceptionOther()+" " : "");
491	491	}
492	492	map.put("contraceptionType",sb.toString());
493	493	map.put("hmarriageStatus",data.getHmarriageStatus() == null ? "" : data.getHmarriageStatus() == 1 ? "初婚" : (data.getHmarriageStatus() == 2 ? "再婚" : "其他"));
...	...	@@ -496,6 +496,7 @@
496	496	map.put("smokeNum",(data.getSmoke() != null && data.getSmoke() == 2) ? data.getSmokeNum() : "");
497	497	map.put("drinkWine",data.getDrinkWine() == null ? "" : data.getDrinkWine() == 1 ? "偶尔" : (data.getDrinkWine() == 2 ? "经常" : "否"));
498	498	map.put("hLevelType",getBasicConfig(data.getHlevelTypeId()));
	499	+ map.put("hmarriageAge",data.getHmarriageAge() == null ? "" : data.getHmarriageAge());
499	500	map.put("pastHistory",data.getPastHistory() == null ? "" : data.getPastHistory());
500	501	map.put("familyHistory",data.getFamilyHistory() == null ? "" : data.getFamilyHistory());
501	502	map.put("other",data.getOther() == null ? "" :data.getOther());

...	...	@@ -395,7 +395,7 @@
395	395	private Integer marriageCheck;
396	396
397	397	//避孕方式 1 未避孕 2口服避孕药 3避孕套 4避孕膜 5其他
398		- private List<Map<String,Boolean>> contraceptionType;
	398	+ private Map<String,Boolean> contraceptionType;
399	399	private String contraceptionOther;
400	400
401	401	//丈夫婚姻状态 1初婚 2 再婚 3其他
402	402
...	...	@@ -458,11 +458,11 @@
458	458	this.marriageCheck = marriageCheck;
459	459	}
460	460
461		- public List<Map<String,Boolean>> getContraceptionType() {
	461	+ public Map<String,Boolean> getContraceptionType() {
462	462	return contraceptionType;
463	463	}
464	464
465		- public void setContraceptionType(List<Map<String,Boolean>> contraceptionType) {
	465	+ public void setContraceptionType(Map<String,Boolean> contraceptionType) {
466	466	this.contraceptionType = contraceptionType;
467	467	}
468	468

...	...	@@ -357,7 +357,7 @@
357	357	private Integer marriageCheck;
358	358
359	359	//避孕方式 1 未避孕 2口服避孕药 3避孕套 4避孕膜 5其他
360		- private List<Map<String,Boolean>> contraceptionType;
	360	+ private Map<String,Boolean> contraceptionType;
361	361	private String contraceptionOther;
362	362
363	363	//丈夫婚姻状态 1初婚 2 再婚 3其他
364	364
...	...	@@ -419,11 +419,11 @@
419	419	this.marriageCheck = marriageCheck;
420	420	}
421	421
422		- public List<Map<String,Boolean>> getContraceptionType() {
	422	+ public Map<String,Boolean> getContraceptionType() {
423	423	return contraceptionType;
424	424	}
425	425
426		- public void setContraceptionType(List<Map<String,Boolean>> contraceptionType) {
	426	+ public void setContraceptionType(Map<String,Boolean> contraceptionType) {
427	427	this.contraceptionType = contraceptionType;
428	428	}
429	429