jiangjiazhi / regional-platform

Authored by jiangjiazhi over 8 years ago

Exists in master and in 6 other branches

Showing 2 changed files

...	...	@@ -83,6 +83,33 @@
83	83	this.name = name;
84	84	}
85	85
	86	+ public enum FmDzEnums{
	87	+ O("住院分娩", "1"),
	88	+ O2("非住院分娩", "2");
	89	+ private FmDzEnums(String name,String id) {
	90	+ this.id = id;
	91	+ this.name = name;
	92	+ }
	93	+
	94	+ private String id;
	95	+ private String name;
	96	+
	97	+ public String getId() {
	98	+ return id;
	99	+ }
	100	+
	101	+ public void setId(String id) {
	102	+ this.id = id;
	103	+ }
	104	+
	105	+ public String getName() {
	106	+ return name;
	107	+ }
	108	+
	109	+ public void setName(String name) {
	110	+ this.name = name;
	111	+ }
	112	+ }
86	113	public enum FmScEnums {
87	114
88	115	O("自然娩出", "1"),

...	...	@@ -914,6 +914,7 @@
914	914	map.put("getTaiShu", getTaiShu());
915	915	map.put("getTaiPan", getTaiPan());
916	916	map.put("getQidaiYc", getQidaiYc());
	917	+ map.put("getFmDzEnums", getFmDzEnums());
917	918	map.put("getRenShenJieJuEnums", getRenShenJieJuEnums());
918	919	map.put("organizations", convert());
919	920	map.put("cTime", DateUtil.getyyyy_MM_dd(new Date()));
...	...	@@ -1070,6 +1071,17 @@
1070	1071	public List getQidaiYc() {
1071	1072	List<Object> list = new ArrayList<>();
1072	1073	for (QiDaiEnums enums : QiDaiEnums.values()) {
	1074	+ Map<String, Object> resultMap = new HashMap<>();
	1075	+ resultMap.put("id", enums.getId());
	1076	+ resultMap.put("name", enums.getName());
	1077	+ list.add(resultMap);
	1078	+ }
	1079	+ return list;
	1080	+ }
	1081	+ //分娩地址
	1082	+ public List getFmDzEnums() {
	1083	+ List<Object> list = new ArrayList<>();
	1084	+ for (FmTypeEnums.FmDzEnums enums : FmTypeEnums.FmDzEnums.values()) {
1073	1085	Map<String, Object> resultMap = new HashMap<>();
1074	1086	resultMap.put("id", enums.getId());
1075	1087	resultMap.put("name", enums.getName());