liquanyu / regional-platform

Commit ab7650a203d24624a69da4c171acd8363790260c

Authored by wtt about 5 years ago

update

Showing 1 changed file with 17 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAutoRiskInfoRequest.java

...	...	@@ -2,11 +2,13 @@
2	2
3	3	import com.lyms.platform.common.base.IBasicRequestConvert;
4	4	import com.lyms.platform.common.core.annotation.form.Form;
	5	+import com.lyms.platform.common.utils.StringUtils;
5	6	import org.hibernate.validator.constraints.NotEmpty;
6	7	import org.springframework.data.mongodb.core.mapping.Document;
7	8
8	9	import javax.validation.constraints.NotNull;
9	10	import java.util.ArrayList;
	11	+import java.util.HashMap;
10	12	import java.util.List;
11	13	import java.util.Map;
12	14
...	...	@@ -26,6 +28,8 @@
26	28	private String dueWeek;
27	29	//分娩方式
28	30	private Map deliveryMode;
	31	+ private String fmfs;
	32	+
29	33	//1 儿童建档，2儿童检查使用自动诊断
30	34	@NotNull(message = "type不能为空")
31	35	@NotEmpty(message = "type不能为空")
...	...	@@ -88,7 +92,11 @@
88	92	public BabyAutoRiskRequest convertToDataModel() {
89	93	BabyAutoRiskRequest babyAutoRiskRequest = new BabyAutoRiskRequest();
90	94	babyAutoRiskRequest.setDueWeek(dueWeek);
91		- babyAutoRiskRequest.setDeliveryMode(deliveryMode);
	95	+ if(StringUtils.isNotEmpty(fmfs)){
	96	+ Map map = new HashMap();
	97	+ map.put("fmfs", fmfs);
	98	+ babyAutoRiskRequest.setDeliveryMode(map);
	99	+ }
92	100	List <MatDeliverAddRequest.Baby> babies = new ArrayList <>();
93	101	MatDeliverAddRequest.Baby baby = new MatDeliverAddRequest.Baby();
94	102	baby.setBabyWeight(babyWeight);
...	...	@@ -121,6 +129,14 @@
121	129	babies.add(baby);
122	130	babyAutoRiskRequest.setBabies(babies);
123	131	return babyAutoRiskRequest;
	132	+ }
	133	+
	134	+ public String getFmfs() {
	135	+ return fmfs;
	136	+ }
	137	+
	138	+ public void setFmfs(String fmfs) {
	139	+ this.fmfs = fmfs;
124	140	}
125	141
126	142	public Integer getType() {