liquanyu / regional-platform

Commit 7bb406a7006bda470696883e388a550f37f974e7

Authored by jiangjiazhi over 9 years ago

Exists in master and in 3 other branches

1

Showing 4 changed files with 31 additions and 7 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java
platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java

...	...	@@ -11,9 +11,11 @@
11	11	import com.lyms.platform.query.AntExChuQuery;
12	12	import com.lyms.platform.query.VisitQuery;
13	13	import org.springframework.beans.factory.annotation.Autowired;
	14	+import org.springframework.data.domain.Sort;
14	15	import org.springframework.stereotype.Service;
15	16	import org.springframework.util.Assert;
16	17
	18	+import java.util.Date;
17	19	import java.util.List;
18	20
19	21	/**
...	...	@@ -31,7 +33,7 @@
31	33	public List<AntenatalExaminationModel> findAllByParentId(String parentId) {
32	34	Assert.notNull(parentId, "findAllByParentId parentId must not be null.");
33	35	MongoCondition condition = MongoCondition.newInstance("parentId", parentId, MongoOper.IS).and("yn", YnEnums.YES.getId(),MongoOper.IS);
34		- return iAntenatalExaminationDao.queryAntenatalExamination(condition.toMongoQuery());
	36	+ return iAntenatalExaminationDao.queryAntenatalExamination(condition.toMongoQuery().addOrder(Sort.Direction.ASC,"created"));
35	37	}
36	38
37	39
...	...	@@ -76,6 +78,7 @@
76	78	*/
77	79	public AntenatalExaminationModel addOneBabyAnt(AntenatalExaminationModel babyVisitModel) {
78	80	Assert.notNull(babyVisitModel, "addOneBabyAnt babyVisitModel must not be null.");
	81	+ babyVisitModel.setCreated(new Date());
79	82	return iAntenatalExaminationDao.addOneAntenatalExamination(babyVisitModel);
80	83	}
81	84
...	...	@@ -118,6 +121,7 @@
118	121	* @return
119	122	*/
120	123	public AntExChuModel addOneAntEx(AntExChuModel obj) {
	124	+ obj.setCreated(new Date());
121	125	return iAntExChuDao.addOneAntEx(obj);
122	126	}
123	127

...	...	@@ -71,6 +71,16 @@
71	71	private String syjg;
72	72	private List placentas;
73	73
	74	+ private Date created;
	75	+
	76	+ public Date getCreated() {
	77	+ return created;
	78	+ }
	79	+
	80	+ public void setCreated(Date created) {
	81	+ this.created = created;
	82	+ }
	83	+
74	84	public String getSyjg() {
75	85	return syjg;
76	86	}

...	...	@@ -2,6 +2,7 @@
2	2
3	3	import org.springframework.data.mongodb.core.mapping.Document;
4	4
	5	+import java.util.Date;
5	6	import java.util.List;
6	7	import java.util.Map;
7	8
...	...	@@ -85,6 +86,15 @@
85	86	//下次产检日期
86	87	private String nextCheckDate;
87	88	private Integer yn;
	89	+ private Date created;
	90	+
	91	+ public Date getCreated() {
	92	+ return created;
	93	+ }
	94	+
	95	+ public void setCreated(Date created) {
	96	+ this.created = created;
	97	+ }
88	98
89	99	public Integer getYn() {
90	100	return yn;

...	...	@@ -38,7 +38,7 @@
38	38	//产程 h 小时 m 分
39	39	private Map<String,Map> prodprocess;
40	40	//总产程
41		- private String totalprocess;
	41	+ private Map totalprocess;
42	42	//会阴情况
43	43	private String perinealCondition;
44	44	//撕裂等级
...	...	@@ -89,8 +89,8 @@
89	89	setDeliveryMode(JsonUtil.str2Obj(destModel.getDeliveryMode(),Map.class));
90	90	setOperationCause(destModel.getOperationCause());
91	91
92		- setProdprocess(JsonUtil.jkstr2Obj(destModel.getProdprocess(),Map.class));
93		- setTotalprocess(destModel.getTotalprocess());
	92	+ setProdprocess(JsonUtil.jkstr2Obj(destModel.getProdprocess(), Map.class));
	93	+ setTotalprocess(JsonUtil.jkstr2Obj(destModel.getTotalprocess(), Map.class));
94	94	setPerinealCondition(destModel.getPerinealCondition());
95	95	setSiLielevel(destModel.getSiLielevel());
96	96	setNeedleNum(destModel.getNeedleNum());
...	...	@@ -183,7 +183,7 @@
183	183
184	184	public Baby(BabyModel babyModel){
185	185	setId(babyModel.getId());
186		- setBabyGender(SexEnum.getTextById(babyModel.getSex()));
	186	+ setBabyGender(babyModel.getSex()+"");
187	187	setBabyWeight(babyModel.getBabyWeight());
188	188	setBabyHeight(babyModel.getBabyHeight());
189	189	setDeformity(babyModel.getMalformation());
190	190
...	...	@@ -500,11 +500,11 @@
500	500	this.tireNumber = tireNumber;
501	501	}
502	502
503		- public String getTotalprocess() {
	503	+ public Map getTotalprocess() {
504	504	return totalprocess;
505	505	}
506	506
507		- public void setTotalprocess(String totalprocess) {
	507	+ public void setTotalprocess(Map totalprocess) {
508	508	this.totalprocess = totalprocess;
509	509	}
510	510