jiangjiazhi / regional-platform

Commit e7178089287f3f36fae46671bb95004b3e9fae84

Authored by liquanyu almost 6 years ago

Exists in master and in 6 other branches

update

Showing 6 changed files with 226 additions and 22 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AmniocentesisInfoModel.java
platform-dal/src/main/java/com/lyms/platform/query/AmniocentesisInfoQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AmniocentesisInfoRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmniocentesisInfo.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmniocentesisInfoView.java

...	...	@@ -60,9 +60,18 @@
60	60	//末次月经
61	61	private Date lastMenses;
62	62
63		- //月经周期
64		- private String mensesCycle;
65	63
	64	+ // 月经周期开始天数
	65	+ private String mensStartDay;
	66	+
	67	+ // 月经周期开始天数
	68	+ private String mensEndDay;
	69	+
	70	+ // 月经停留开始天数
	71	+ private String mensStopStartDay;
	72	+
	73	+ // 月经停留开始天数
	74	+ private String mensStopEndDay;
66	75	//体重
67	76	private String weight;
68	77
...	...	@@ -120,6 +129,38 @@
120	129	private String resultId;
121	130	private String recordId;
122	131
	132	+ public String getMensStartDay() {
	133	+ return mensStartDay;
	134	+ }
	135	+
	136	+ public void setMensStartDay(String mensStartDay) {
	137	+ this.mensStartDay = mensStartDay;
	138	+ }
	139	+
	140	+ public String getMensEndDay() {
	141	+ return mensEndDay;
	142	+ }
	143	+
	144	+ public void setMensEndDay(String mensEndDay) {
	145	+ this.mensEndDay = mensEndDay;
	146	+ }
	147	+
	148	+ public String getMensStopStartDay() {
	149	+ return mensStopStartDay;
	150	+ }
	151	+
	152	+ public void setMensStopStartDay(String mensStopStartDay) {
	153	+ this.mensStopStartDay = mensStopStartDay;
	154	+ }
	155	+
	156	+ public String getMensStopEndDay() {
	157	+ return mensStopEndDay;
	158	+ }
	159	+
	160	+ public void setMensStopEndDay(String mensStopEndDay) {
	161	+ this.mensStopEndDay = mensStopEndDay;
	162	+ }
	163	+
123	164	public String getResultId() {
124	165	return resultId;
125	166	}
...	...	@@ -176,13 +217,6 @@
176	217	this.amnioCount = amnioCount;
177	218	}
178	219
179		- public String getMensesCycle() {
180		- return mensesCycle;
181		- }
182		-
183		- public void setMensesCycle(String mensesCycle) {
184		- this.mensesCycle = mensesCycle;
185		- }
186	220
187	221	public String getPatientId() {
188	222	return patientId;

...	...	@@ -200,6 +200,14 @@
200	200	condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
201	201	}
202	202
	203	+ if (null != cardNo) {
	204	+ condition = condition.and("cardNo", cardNo, MongoOper.IS);
	205	+ }
	206	+
	207	+ if (null != vcCardNo) {
	208	+ condition = condition.and("vcCardNo", vcCardNo, MongoOper.IS);
	209	+ }
	210	+
203	211	if (StringUtils.isNotEmpty(provinceId)) {
204	212	condition = condition.and("provinceId", provinceId, MongoOper.IS);
205	213	}

...	...	@@ -115,6 +115,12 @@
115	115	data.put("lastMenses",DateUtil.getyyyy_MM_dd(pat.getLastMenses()));
116	116	Date dueDate = DateUtil.addDay(DateUtil.addMonth(pat.getLastMenses(), 9), 7);
117	117	data.put("dueDate",DateUtil.getyyyy_MM_dd(dueDate));
	118	+
	119	+ data.put("mensStartDay",pat.getMensStartDay());
	120	+ data.put("mensEndDay",pat.getMensEndDay());
	121	+ data.put("mensStopStartDay",pat.getMensStopStartDay());
	122	+ data.put("mensStopEndDay",pat.getMensStopEndDay());
	123	+
118	124	data.put("week",DateUtil.getWeekDesc(pat.getLastMenses(),new Date()));
119	125	}
120	126

...	...	@@ -57,9 +57,19 @@
57	57	//末次月经
58	58	private String lastMenses;
59	59
60		- //月经周期
61		- private String mensesCycle;
	60	+ // 月经周期开始天数
	61	+ private String mensStartDay;
62	62
	63	+ // 月经周期开始天数
	64	+ private String mensEndDay;
	65	+
	66	+ // 月经停留开始天数
	67	+ private String mensStopStartDay;
	68	+
	69	+ // 月经停留开始天数
	70	+ private String mensStopEndDay;
	71	+
	72	+
63	73	//体重
64	74	private String weight;
65	75
66	76
...	...	@@ -242,14 +252,7 @@
242	252	this.lastMenses = lastMenses;
243	253	}
244	254
245		- public String getMensesCycle() {
246		- return mensesCycle;
247		- }
248	255
249		- public void setMensesCycle(String mensesCycle) {
250		- this.mensesCycle = mensesCycle;
251		- }
252		-
253	256	public String getWeight() {
254	257	return weight;
255	258	}
...	...	@@ -346,6 +349,38 @@
346	349	this.hospitalId = hospitalId;
347	350	}
348	351
	352	+ public String getMensStartDay() {
	353	+ return mensStartDay;
	354	+ }
	355	+
	356	+ public void setMensStartDay(String mensStartDay) {
	357	+ this.mensStartDay = mensStartDay;
	358	+ }
	359	+
	360	+ public String getMensEndDay() {
	361	+ return mensEndDay;
	362	+ }
	363	+
	364	+ public void setMensEndDay(String mensEndDay) {
	365	+ this.mensEndDay = mensEndDay;
	366	+ }
	367	+
	368	+ public String getMensStopStartDay() {
	369	+ return mensStopStartDay;
	370	+ }
	371	+
	372	+ public void setMensStopStartDay(String mensStopStartDay) {
	373	+ this.mensStopStartDay = mensStopStartDay;
	374	+ }
	375	+
	376	+ public String getMensStopEndDay() {
	377	+ return mensStopEndDay;
	378	+ }
	379	+
	380	+ public void setMensStopEndDay(String mensStopEndDay) {
	381	+ this.mensStopEndDay = mensStopEndDay;
	382	+ }
	383	+
349	384	@Override
350	385	public AmniocentesisInfoModel convertToDataModel() {
351	386	AmniocentesisInfoModel model = new AmniocentesisInfoModel();
...	...	@@ -368,7 +403,11 @@
368	403	model.setProdTime(getProdTime());
369	404	model.setLastMenses(DateUtil.parseYMD(getLastMenses()));
370	405	model.setWeight(getWeight());
371		- model.setMensesCycle(getMensesCycle());
	406	+ model.setMensStartDay(getMensStartDay());
	407	+ model.setMensEndDay(getMensEndDay());
	408	+ model.setMensStopStartDay(getMensStopStartDay());
	409	+ model.setMensStopEndDay(getMensStopEndDay());
	410	+
372	411	model.setSituation(getSituation());
373	412	model.setPoisonous(getPoisonous());
374	413	model.setFamilyHistory(getFamilyHistory());

...	...	@@ -98,7 +98,19 @@
98	98	//创建机构
99	99	private String hospitalId;
100	100
	101	+ // 月经周期开始天数
	102	+ private String mensStartDay;
101	103
	104	+ // 月经周期开始天数
	105	+ private String mensEndDay;
	106	+
	107	+ // 月经停留开始天数
	108	+ private String mensStopStartDay;
	109	+
	110	+ // 月经停留开始天数
	111	+ private String mensStopEndDay;
	112	+
	113	+
102	114	@Override
103	115	public AmniocentesisInfo convertToResult(AmniocentesisInfoModel destModel) {
104	116	setPatientId(destModel.getPatientId());
...	...	@@ -121,7 +133,6 @@
121	133	setProdTime(destModel.getProdTime());
122	134	setLastMenses(DateUtil.getyyyy_MM_dd(destModel.getLastMenses()));
123	135	setWeight(destModel.getWeight());
124		- setMensesCycle(destModel.getMensesCycle());
125	136
126	137	setSituation(destModel.getSituation());
127	138	setPoisonous(destModel.getPoisonous());
128	139
...	...	@@ -135,7 +146,44 @@
135	146	setChip(destModel.getChip());
136	147	setUserId(destModel.getUserId());
137	148	setHospitalId(destModel.getHospitalId());
	149	+ setMensStartDay(destModel.getMensStartDay());
	150	+ setMensEndDay(destModel.getMensEndDay());
	151	+ setMensStopStartDay(destModel.getMensStopStartDay());
	152	+ setMensStopEndDay(destModel.getMensStopEndDay());
	153	+
138	154	return this;
	155	+ }
	156	+
	157	+ public String getMensStartDay() {
	158	+ return mensStartDay;
	159	+ }
	160	+
	161	+ public void setMensStartDay(String mensStartDay) {
	162	+ this.mensStartDay = mensStartDay;
	163	+ }
	164	+
	165	+ public String getMensEndDay() {
	166	+ return mensEndDay;
	167	+ }
	168	+
	169	+ public void setMensEndDay(String mensEndDay) {
	170	+ this.mensEndDay = mensEndDay;
	171	+ }
	172	+
	173	+ public String getMensStopStartDay() {
	174	+ return mensStopStartDay;
	175	+ }
	176	+
	177	+ public void setMensStopStartDay(String mensStopStartDay) {
	178	+ this.mensStopStartDay = mensStopStartDay;
	179	+ }
	180	+
	181	+ public String getMensStopEndDay() {
	182	+ return mensStopEndDay;
	183	+ }
	184	+
	185	+ public void setMensStopEndDay(String mensStopEndDay) {
	186	+ this.mensStopEndDay = mensStopEndDay;
139	187	}
140	188
141	189	public String getMensesCycle() {

...	...	@@ -4,7 +4,9 @@
4	4	import com.lyms.platform.common.utils.DateUtil;
5	5	import com.lyms.platform.pojo.AmniocentesisInfoModel;
6	6
	7	+import java.util.Date;
7	8
	9	+
8	10	/**
9	11	* Created by Administrator on 2019-10-14.
10	12	*/
...	...	@@ -92,6 +94,23 @@
92	94	private String hospitalName;
93	95
94	96
	97	+ //孕周
	98	+ private String week;
	99	+
	100	+
	101	+ // 月经周期开始天数
	102	+ private String mensStartDay;
	103	+
	104	+ // 月经周期开始天数
	105	+ private String mensEndDay;
	106	+
	107	+ // 月经停留开始天数
	108	+ private String mensStopStartDay;
	109	+
	110	+ // 月经停留开始天数
	111	+ private String mensStopEndDay;
	112	+
	113	+
95	114	@Override
96	115	public AmniocentesisInfoView convertToResult(AmniocentesisInfoModel destModel) {
97	116	setPatientId(destModel.getPatientId());
98	117
99	118
...	...	@@ -111,14 +130,64 @@
111	130	setSituation(destModel.getSituation());
112	131	setPoisonous(destModel.getPoisonous());
113	132	setFamilyHistory(destModel.getFamilyHistory());
114		- setTangDanger("0".equals(destModel.getTangDanger()) ? "低" : "1".equals(destModel.getTangDanger()) ? "中" : "高");
	133	+ setTangDanger(destModel.getTangDanger() == null ? "" : "0".equals(destModel.getTangDanger()) ? "低" : "1".equals(destModel.getTangDanger()) ? "中" : "高");
115	134	setReferralHospital(destModel.getReferralHospital());
116	135	setOperation(destModel.getOperation());
117	136
118	137	setOrderDate(DateUtil.getyyyy_MM_dd(destModel.getOrderDate()));
119	138	setApplyDate(DateUtil.getyyyy_MM_dd(destModel.getApplyDate()));
120		- setChip("0".equals(destModel.getChip()) ? "无" : "有");
	139	+ setChip(destModel.getChip() == null ? "" : "0".equals(destModel.getChip()) ? "无" : "有");
	140	+ setWeek(DateUtil.getWeekDesc(destModel.getLastMenses(), new Date()));
	141	+
	142	+ setMensStartDay(destModel.getMensStartDay());
	143	+
	144	+ setMensEndDay(destModel.getMensEndDay());
	145	+
	146	+ setMensStopStartDay(destModel.getMensStopStartDay());
	147	+
	148	+ setMensStopEndDay(destModel.getMensStopEndDay());
121	149	return this;
	150	+ }
	151	+
	152	+
	153	+ public String getMensStartDay() {
	154	+ return mensStartDay;
	155	+ }
	156	+
	157	+ public void setMensStartDay(String mensStartDay) {
	158	+ this.mensStartDay = mensStartDay;
	159	+ }
	160	+
	161	+ public String getMensEndDay() {
	162	+ return mensEndDay;
	163	+ }
	164	+
	165	+ public void setMensEndDay(String mensEndDay) {
	166	+ this.mensEndDay = mensEndDay;
	167	+ }
	168	+
	169	+ public String getMensStopStartDay() {
	170	+ return mensStopStartDay;
	171	+ }
	172	+
	173	+ public void setMensStopStartDay(String mensStopStartDay) {
	174	+ this.mensStopStartDay = mensStopStartDay;
	175	+ }
	176	+
	177	+ public String getMensStopEndDay() {
	178	+ return mensStopEndDay;
	179	+ }
	180	+
	181	+ public void setMensStopEndDay(String mensStopEndDay) {
	182	+ this.mensStopEndDay = mensStopEndDay;
	183	+ }
	184	+
	185	+ public String getWeek() {
	186	+ return week;
	187	+ }
	188	+
	189	+ public void setWeek(String week) {
	190	+ this.week = week;
122	191	}
123	192
124	193	public String getPatientId() {