shiyang / regional-platform

Commit f04e1dcf7811de38bf5c6e32d48b04847a180251

Authored by jiangjiazhi over 9 years ago

增加是否通知

Showing 8 changed files with 66 additions and 24 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntExChuDaoImpl.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntenatalExaminationDaoImpl.java
platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java
platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java

...	...	@@ -9,6 +9,7 @@
9	9	import org.springframework.data.mongodb.core.query.Query;
10	10	import org.springframework.stereotype.Repository;
11	11
	12	+import java.util.Date;
12	13	import java.util.List;
13	14
14	15	/**
...	...	@@ -44,6 +45,7 @@
44	45	* @param mongoQuery
45	46	*/
46	47	public void updateOneAntEx(MongoQuery mongoQuery,AntExChuModel antExChuModel){
	48	+ antExChuModel.setModified(new Date());
47	49	findAndModify(mongoQuery.convertToMongoQuery(),antExChuModel);
48	50	}
49	51

...	...	@@ -9,6 +9,7 @@
9	9	import com.lyms.platform.pojo.AntenatalExaminationModel;
10	10	import org.springframework.stereotype.Repository;
11	11
	12	+import java.util.Date;
12	13	import java.util.List;
13	14
14	15	/**
...	...	@@ -23,6 +24,7 @@
23	24
24	25	@Override
25	26	public void updateAntenatalExamination(AntenatalExaminationModel obj, String id) {
	27	+ obj.setModified(new Date());
26	28	update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), obj);
27	29	}
28	30

...	...	@@ -232,6 +232,15 @@
232	232	private String totalBilirubin;
233	233	// 结合胆红素
234	234	private String jhBilirubin ;
	235	+
	236	+ public Date getModified() {
	237	+ return modified;
	238	+ }
	239	+
	240	+ public void setModified(Date modified) {
	241	+ this.modified = modified;
	242	+ }
	243	+
235	244	//乙肝表面抗原
236	245	private String ygbmky;
237	246	//乙肝表面抗体
...	...	@@ -254,6 +263,8 @@
254	263	private String ydfmw;
255	264	// 阴道清洁度
256	265	private String ydqjd;
	266	+
	267	+ private Date modified;
257	268
258	269
259	270

...	...	@@ -88,8 +88,16 @@
88	88	private String nextCheckTime;
89	89	private Integer yn;
90	90	private Date created;
91		-
	91	+ private Date modified;
92	92	private String hospitalId;
	93	+
	94	+ public Date getModified() {
	95	+ return modified;
	96	+ }
	97	+
	98	+ public void setModified(Date modified) {
	99	+ this.modified = modified;
	100	+ }
93	101
94	102	public String getHospitalId() {
95	103	return hospitalId;

...	...	@@ -21,7 +21,7 @@
21	21	//患者年龄
22	22	private Integer age;
23	23	//孕周
24		- private String dueWeek;
	24	+// private String dueWeek;
25	25	//身份证号
26	26	private String cardNo;
27	27	//预产期
...	...	@@ -98,13 +98,6 @@
98	98	this.dueDate = dueDate;
99	99	}
100	100
101		- public String getDueWeek() {
102		- return dueWeek;
103		- }
104		-
105		- public void setDueWeek(String dueWeek) {
106		- this.dueWeek = dueWeek;
107		- }
108	101
109	102	public String getName() {
110	103	return name;

...	...	@@ -7,6 +7,8 @@
7	7	import com.lyms.platform.common.dao.operator.MongoOper;
8	8	import com.lyms.platform.common.dao.operator.MongoQuery;
9	9
	10	+import java.util.Date;
	11	+
10	12	/**
11	13	* Created by Administrator on 2016/6/15 0015.
12	14	*/
...	...	@@ -31,7 +33,9 @@
31	33	//年龄
32	34	private String age;
33	35	//孕周
34		- private String dueWeek;
	36	+ private Date dueDateStart;
	37	+ //孕周
	38	+ private Date dueDateEnd;
35	39	//风险等级
36	40	private String rLevel;
37	41	private Integer score;
...	...	@@ -82,6 +86,22 @@
82	86	this.id = id;
83	87	}
84	88
	89	+ public Date getDueDateEnd() {
	90	+ return dueDateEnd;
	91	+ }
	92	+
	93	+ public void setDueDateEnd(Date dueDateEnd) {
	94	+ this.dueDateEnd = dueDateEnd;
	95	+ }
	96	+
	97	+ public Date getDueDateStart() {
	98	+ return dueDateStart;
	99	+ }
	100	+
	101	+ public void setDueDateStart(Date dueDateStart) {
	102	+ this.dueDateStart = dueDateStart;
	103	+ }
	104	+
85	105	@Override
86	106	public MongoQuery convertToQuery() {
87	107	MongoCondition condition = MongoCondition.newInstance();
...	...	@@ -109,8 +129,9 @@
109	129	if(null!=outHospitalId){
110	130	condition=condition.and("outHospitalId",outHospitalId, MongoOper.IS);
111	131	}
112		- if(null!=dueWeek){
113		- condition=condition.and("dueWeek",dueWeek, MongoOper.IS);
	132	+ //需要修改
	133	+ if(null!=dueDateEnd){
	134	+ condition=condition.and("dueWeek",dueDateEnd, MongoOper.IS);
114	135	}
115	136	if(null!=rLevel){
116	137	condition=condition.and("rLevel",rLevel, MongoOper.IS);
117	138
...	...	@@ -147,13 +168,7 @@
147	168	this.cardNo = cardNo;
148	169	}
149	170
150		- public String getDueWeek() {
151		- return dueWeek;
152		- }
153	171
154		- public void setDueWeek(String dueWeek) {
155		- this.dueWeek = dueWeek;
156		- }
157	172
158	173	public String getName() {
159	174	return name;

...	...	@@ -163,7 +163,7 @@
163	163	ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
164	164	referralApplyOrderQuery.setName(applyOrderQueryRequest.getName());
165	165	referralApplyOrderQuery.setAge(applyOrderQueryRequest.getAge());
166		- referralApplyOrderQuery.setDueWeek(applyOrderQueryRequest.getDueWeek());
	166	+ referralApplyOrderQuery.setDueWeek(applyOrderQueryRequest.getDueWeekStart());
167	167	referralApplyOrderQuery.setRiskFactor(applyOrderQueryRequest.getRiskFactor());
168	168	referralApplyOrderQuery.setrLevel(applyOrderQueryRequest.getrLevel());
169	169	referralApplyOrderQuery.setScore(applyOrderQueryRequest.getScore());

...	...	@@ -31,7 +31,10 @@
31	31	//年龄
32	32	private String age;
33	33	//孕周
34		- private String dueWeek;
	34	+ private String dueWeekStart;
	35	+
	36	+ private String getDueWeekEnd;
	37	+
35	38	//风险等级
36	39	private String rLevel;
37	40	private Integer score;
38	41
...	...	@@ -85,12 +88,20 @@
85	88	this.age = age;
86	89	}
87	90
88		- public String getDueWeek() {
89		- return dueWeek;
	91	+ public String getDueWeekStart() {
	92	+ return dueWeekStart;
90	93	}
91	94
92		- public void setDueWeek(String dueWeek) {
93		- this.dueWeek = dueWeek;
	95	+ public void setDueWeekStart(String dueWeekStart) {
	96	+ this.dueWeekStart = dueWeekStart;
	97	+ }
	98	+
	99	+ public String getGetDueWeekEnd() {
	100	+ return getDueWeekEnd;
	101	+ }
	102	+
	103	+ public void setGetDueWeekEnd(String getDueWeekEnd) {
	104	+ this.getDueWeekEnd = getDueWeekEnd;
94	105	}
95	106
96	107	public String getRiskFactor() {