jiangjiazhi / regional-platform

Commit 733b6ca05c8cae8ba53570e5819e1d4dddbaa36c

Authored by yangfei almost 8 years ago

Exists in master and in 6 other branches

儿保月龄套餐

Showing 5 changed files with 35 additions and 3 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java

...	...	@@ -378,7 +378,16 @@
378	378	//其他及系统现有的辅助检查项
379	379	private String qtfz;
380	380
	381	+ // 纠正月龄\|\|纠正胎龄
	382	+ private String correctAge;
381	383
	384	+ public String getCorrectAge() {
	385	+ return correctAge;
	386	+ }
	387	+
	388	+ public void setCorrectAge(String correctAge) {
	389	+ this.correctAge = correctAge;
	390	+ }
382	391
383	392	public Integer getTcType() {
384	393	return tcType;

...	...	@@ -7,9 +7,11 @@
7	7	import com.lyms.platform.common.result.BaseObjectResponse;
8	8	import com.lyms.platform.common.result.BaseResponse;
9	9	import com.lyms.platform.common.utils.*;
10		-import com.lyms.platform.common.utils.StringUtils;
11	10	import com.lyms.platform.operate.web.request.BabyCheckRequest;
12		-import com.lyms.platform.operate.web.result.*;
	11	+import com.lyms.platform.operate.web.result.BabyBasicResult;
	12	+import com.lyms.platform.operate.web.result.BabyCheckResult;
	13	+import com.lyms.platform.operate.web.result.BabyChooseResult;
	14	+import com.lyms.platform.operate.web.result.HighScoreResult;
13	15	import com.lyms.platform.operate.web.utils.MongoUtil;
14	16	import com.lyms.platform.permission.dao.master.CouponMapper;
15	17	import com.lyms.platform.permission.model.Organization;
...	...	@@ -20,7 +22,6 @@
20	22	import com.lyms.platform.pojo.*;
21	23	import com.lyms.platform.query.*;
22	24	import org.apache.commons.collections.CollectionUtils;
23		-import org.apache.commons.lang.*;
24	25	import org.springframework.beans.factory.annotation.Autowired;
25	26	import org.springframework.data.domain.Sort;
26	27	import org.springframework.stereotype.Component;
...	...	@@ -159,6 +160,7 @@
159	160
160	161	BabyCheckModel model = new BabyCheckModel();
161	162	//新加字段
	163	+ model.setCorrectAge(request.getCorrectAge());
162	164	model.setTcType(request.getTcType());
163	165	model.setCnqk(request.getCnqk());
164	166	model.setMtcnNum(request.getMtcnNum());
...	...	@@ -1133,6 +1135,7 @@
1133	1135	model.setId(checkModel.getId());
1134	1136
1135	1137	//新加字段
	1138	+ model.setCorrectAge(checkModel.getCorrectAge());
1136	1139	model.setTcType(checkModel.getTcType());
1137	1140	model.setCnqk(checkModel.getCnqk());
1138	1141	model.setMtcnNum(checkModel.getMtcnNum());

...	...	@@ -327,6 +327,8 @@
327	327	//是否高危儿童 0 非高危 1高危
328	328	private Integer highRisk;
329	329	/****诊断指导**/
	330	+ // 纠正月龄\|\|纠正胎龄
	331	+ private String correctAge;
330	332
331	333	@FormParam
332	334	@NotEmpty(message = "检查日期不能为空")
...	...	@@ -337,6 +339,14 @@
337	339	private String couponCode;
338	340	//使用状态
339	341	private Integer couponType;
	342	+
	343	+ public String getCorrectAge() {
	344	+ return correctAge;
	345	+ }
	346	+
	347	+ public void setCorrectAge(String correctAge) {
	348	+ this.correctAge = correctAge;
	349	+ }
340	350
341	351	public String getWlTong() {
342	352	return wlTong;

...	...	@@ -388,7 +388,16 @@
388	388	//其他及系统现有的辅助检查项
389	389	private String qtfz;
390	390
	391	+ // 纠正月龄\|\|纠正胎龄
	392	+ private String correctAge;
391	393
	394	+ public String getCorrectAge() {
	395	+ return correctAge;
	396	+ }
	397	+
	398	+ public void setCorrectAge(String correctAge) {
	399	+ this.correctAge = correctAge;
	400	+ }
392	401	public Integer getTcType() {
393	402	return tcType;
394	403	}

...	...	@@ -181,6 +181,7 @@
181	181
182	182	private String couponCode;
183	183
	184	+
184	185	public List<PatientSerResult> getPatientSerResults() {
185	186	return patientSerResults;
186	187	}