jiangjiazhi / regional-platform

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 37 additions and 2 deletions

...	...	@@ -110,6 +110,18 @@
110	110	this.name = name;
111	111	}
112	112	}
	113	+
	114	+ public static String getFmDzNameById(String id)
	115	+ {
	116	+ for (FmDzEnums e : FmDzEnums.values()) {
	117	+ if (e.getId().equals(id))
	118	+ {
	119	+ return e.getName();
	120	+ }
	121	+ }
	122	+ return null;
	123	+ }
	124	+
113	125	public enum FmScEnums {
114	126
115	127	O("自然娩出", "1"),

...	...	@@ -8,7 +8,6 @@
8	8	import java.io.Serializable;
9	9	import java.util.Date;
10	10	import java.util.List;
11		-import java.util.Map;
12	11
13	12	/**
14	13	* 产妇分娩
...	...	@@ -26,7 +25,10 @@
26	25	private String pid;
27	26	//分娩时间
28	27	private String dueDate;
29		-
	28	+ //分娩地址方式，本院、外院
	29	+ private String fmType;
	30	+ //外院地址
	31	+ private Date fmAddr;
30	32	private Date dueDate1;
31	33	//分娩孕周
32	34	private String dueWeek;
...	...	@@ -121,6 +123,22 @@
121	123	private Date modified;
122	124	private String hospitalId;
123	125
	126	+ public String getFmType() {
	127	+ return fmType;
	128	+ }
	129	+
	130	+ public void setFmType(String fmType) {
	131	+ this.fmType = fmType;
	132	+ }
	133	+
	134	+ public Date getFmAddr() {
	135	+ return fmAddr;
	136	+ }
	137	+
	138	+ public void setFmAddr(Date fmAddr) {
	139	+ this.fmAddr = fmAddr;
	140	+ }
	141	+
124	142	public String getHospitalId() {
125	143	return hospitalId;
126	144	}
...	...	@@ -280,6 +298,7 @@
280	298	public String getBabyHealthy() {
281	299	return babyHealthy;
282	300	}
	301	+
283	302
284	303	public void setBabyHealthy(String babyHealthy) {
285	304	this.babyHealthy = babyHealthy;

...	...	@@ -907,6 +907,10 @@
907	907
908	908	Map<String, Object> map = new HashMap<>();
909	909	map.put("id", data.getId());
	910	+ if(StringUtils.isNotEmpty(data.getFmType())){
	911	+ map.put("fmType", FmTypeEnums.getFmDzNameById(data.getFmType()));
	912	+ }
	913	+ map.put("fmAddr", data.getFmAddr());
910	914	map.put("username", patients.getUsername());
911	915	map.put("birth", DateUtil.getyyyy_MM_dd(patients.getBirth()));
912	916	map.put("age", UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()), UnitConstants.SUI));