jiangjiazhi / regional-platform

Commit 2b2ecaee12f6d53a8513e579e8e0512cfdeea9e7

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

增加是否通知

Showing 8 changed files with 88 additions and 31 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.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/AntExcAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderInResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java

...	...	@@ -20,6 +20,7 @@
20	20	private Date dueDate;
21	21	//末次月经
22	22	private Date lastMenses;
	23	+ private String cDueWeek;
23	24	// 既往史
24	25	private String pastHistory ;
25	26	// 家族史
...	...	@@ -87,6 +88,14 @@
87	88	private Date created;
88	89	private String hospitalId;
89	90
	91	+ public String getcDueWeek() {
	92	+ return cDueWeek;
	93	+ }
	94	+
	95	+ public void setcDueWeek(String cDueWeek) {
	96	+ this.cDueWeek = cDueWeek;
	97	+ }
	98	+
90	99	public String getHospitalId() {
91	100	return hospitalId;
92	101	}
93	102
...	...	@@ -190,9 +199,9 @@
190	199	//产检医生
191	200	private String prodDoctor;
192	201	//产检日期
193		- private String checkTime;
	202	+ private Date checkTime;
194	203	//下次产检时间
195		- private String nextCheckTime;
	204	+ private Date nextCheckTime;
196	205	private Integer yn;
197	206	//血红蛋白值
198	207	private String xhdb ;
199	208
200	209
...	...	@@ -276,16 +285,9 @@
276	285	this.cestationInfo = cestationInfo;
277	286	}
278	287
279		- public String getCheckTime() {
280		- return checkTime;
281		- }
282	288
283		- public void setCheckTime(String checkTime) {
284		- this.checkTime = checkTime;
285		- }
286	289
287	290
288		-
289	291	public String getDiagnosis() {
290	292	return diagnosis;
291	293	}
292	294
293	295
...	...	@@ -367,12 +369,19 @@
367	369	}
368	370
369	371
	372	+ public Date getCheckTime() {
	373	+ return checkTime;
	374	+ }
370	375
371		- public String getNextCheckTime() {
	376	+ public void setCheckTime(Date checkTime) {
	377	+ this.checkTime = checkTime;
	378	+ }
	379	+
	380	+ public Date getNextCheckTime() {
372	381	return nextCheckTime;
373	382	}
374	383
375		- public void setNextCheckTime(String nextCheckTime) {
	384	+ public void setNextCheckTime(Date nextCheckTime) {
376	385	this.nextCheckTime = nextCheckTime;
377	386	}
378	387

...	...	@@ -8,6 +8,7 @@
8	8	import com.lyms.platform.common.result.BaseListResponse;
9	9	import com.lyms.platform.common.result.BaseObjectResponse;
10	10	import com.lyms.platform.common.result.BaseResponse;
	11	+import com.lyms.platform.common.utils.DateUtil;
11	12	import com.lyms.platform.common.utils.SystemConfig;
12	13	import com.lyms.platform.operate.web.request.ApplyOrderQueryRequest;
13	14	import com.lyms.platform.operate.web.request.ReferralApplyOrderAddRequest;
...	...	@@ -26,6 +27,7 @@
26	27	import com.lyms.platform.query.SieveApplyOrderQuery;
27	28	import com.lyms.platform.query.SieveQuery;
28	29	import org.apache.commons.collections.CollectionUtils;
	30	+import org.apache.commons.lang.StringUtils;
29	31	import org.springframework.beans.factory.annotation.Autowired;
30	32	import org.springframework.stereotype.Component;
31	33
...	...	@@ -163,7 +165,9 @@
163	165	ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
164	166	referralApplyOrderQuery.setName(applyOrderQueryRequest.getName());
165	167	referralApplyOrderQuery.setAge(applyOrderQueryRequest.getAge());
166		- referralApplyOrderQuery.setDueWeek(applyOrderQueryRequest.getDueWeekStart());
	168	+ if(StringUtils.isNotEmpty(applyOrderQueryRequest.getDueWeekStart())){
	169	+ referralApplyOrderQuery.setDueDateStart(DateUtil.parseYMD(applyOrderQueryRequest.getDueWeekStart()));
	170	+ }
167	171	referralApplyOrderQuery.setRiskFactor(applyOrderQueryRequest.getRiskFactor());
168	172	referralApplyOrderQuery.setrLevel(applyOrderQueryRequest.getrLevel());
169	173	referralApplyOrderQuery.setScore(applyOrderQueryRequest.getScore());

...	...	@@ -120,7 +120,9 @@
120	120	//产检日期
121	121	private String checkTime;
122	122	//下次产检时间
123		- private Map nextCheckTime;
	123	+ private String nextCheckTime;
	124	+ //前端计算出来的孕周
	125	+ private String cDueWeek;
124	126
125	127	/辅助检查结果录入 /
126	128	//血红蛋白值
...	...	@@ -240,6 +242,14 @@
240	242	this.chgOther = chgOther;
241	243	}
242	244
	245	+ public String getcDueWeek() {
	246	+ return cDueWeek;
	247	+ }
	248	+
	249	+ public void setcDueWeek(String cDueWeek) {
	250	+ this.cDueWeek = cDueWeek;
	251	+ }
	252	+
243	253	public String getDueDate() {
244	254	return dueDate;
245	255	}
246	256
...	...	@@ -674,11 +684,11 @@
674	684	this.highriskSocre = highriskSocre;
675	685	}
676	686
677		- public Map getNextCheckTime() {
	687	+ public String getNextCheckTime() {
678	688	return nextCheckTime;
679	689	}
680	690
681		- public void setNextCheckTime(Map nextCheckTime) {
	691	+ public void setNextCheckTime(String nextCheckTime) {
682	692	this.nextCheckTime = nextCheckTime;
683	693	}
684	694
...	...	@@ -873,8 +883,13 @@
873	883	antExChuModel.setTreatOpinion(treatOpinion);
874	884	antExChuModel.setDirOpinion(dirOpinion);
875	885	antExChuModel.setProdDoctor(prodDoctor);
876		- antExChuModel.setCheckTime(checkTime);
877		- antExChuModel.setNextCheckTime(JsonUtil.obj2JsonString(nextCheckTime));
	886	+ if(null!=checkTime){
	887	+ antExChuModel.setCheckTime(DateUtil.parseYMD(checkTime));
	888	+ }
	889	+ if(null!=nextCheckTime){
	890	+ antExChuModel.setNextCheckTime(DateUtil.parseYMD(nextCheckTime));
	891	+ }
	892	+ antExChuModel.setcDueWeek(cDueWeek);
878	893	if(StringUtils.isNotEmpty(lastMenses)){
879	894	antExChuModel.setLastMenses(DateUtil.parseYMD(lastMenses));
880	895	}

...	...	@@ -64,7 +64,10 @@
64	64	String week = (days / 7) + "";
65	65	int day = (days % 7);
66	66	this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : "");
67		- this.checkTime = model.getCheckTime();
	67	+ if(null!=model.getCheckTime()){
	68	+ this.checkTime = DateUtil.getyyyy_MM_dd(model.getCheckTime());
	69	+ }
	70	+
68	71	this.title="初诊";
69	72	this.type="2";
70	73	this.hospitalName=hospitalName;

...	...	@@ -41,6 +41,8 @@
41	41	//预产期
42	42	private String dueDate;
43	43
	44	+ private String cDueWeek;
	45	+
44	46	/**
45	47	* 初检信息
46	48	**/
...	...	@@ -133,7 +135,7 @@
133	135	//产检日期
134	136	private String checkTime;
135	137	//下次产检时间
136		- private Map nextCheckTime;
	138	+ private String nextCheckTime;
137	139
138	140
139	141	/**
...	...	@@ -224,6 +226,14 @@
224	226	return syjg;
225	227	}
226	228
	229	+ public String getcDueWeek() {
	230	+ return cDueWeek;
	231	+ }
	232	+
	233	+ public void setcDueWeek(String cDueWeek) {
	234	+ this.cDueWeek = cDueWeek;
	235	+ }
	236	+
227	237	public void setSyjg(String syjg) {
228	238	this.syjg = syjg;
229	239	}
230	240
...	...	@@ -474,11 +484,11 @@
474	484	}
475	485
476	486
477		- public Map getNextCheckTime() {
	487	+ public String getNextCheckTime() {
478	488	return nextCheckTime;
479	489	}
480	490
481		- public void setNextCheckTime(Map nextCheckTime) {
	491	+ public void setNextCheckTime(String nextCheckTime) {
482	492	this.nextCheckTime = nextCheckTime;
483	493	}
484	494
485	495
...	...	@@ -892,13 +902,12 @@
892	902	setTreatOpinion(antExChuModel.getTreatOpinion());
893	903	setDirOpinion(antExChuModel.getDirOpinion());
894	904	setProdDoctor(antExChuModel.getProdDoctor());
895		- setCheckTime(antExChuModel.getCheckTime());
896		- try {
897		-
898		- setNextCheckTime(JsonUtil.str2Obj(antExChuModel.getNextCheckTime(), Map.class));
899		- } catch (Exception e) {
900		-
	905	+ if(null!=antExChuModel.getCheckTime()){
	906	+ setCheckTime(DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime()));
901	907	}
	908	+ if(null!=antExChuModel.getNextCheckTime()){
	909	+ setNextCheckTime(DateUtil.getyyyy_MM_dd(antExChuModel.getNextCheckTime()));
	910	+ }
902	911	setSyjg(antExChuModel.getSyjg());
903	912	setAbo(antExChuModel.getAbo());
904	913	setAlbumin(antExChuModel.getAlbumin());
...	...	@@ -927,7 +936,6 @@
927	936	setYgekt(antExChuModel.getYgekt());
928	937	setXqjq(antExChuModel.getXqjq());
929	938	setXnsd(antExChuModel.getXnsd());
930		-// setMdxqsy(antExChuModel.getMdxqsy());
931	939	setHivkt(antExChuModel.getHivkt());
932	940	setYdfmw(JsonUtil.str2Obj(antExChuModel.getYdfmw(), Map.class));
933	941	setYdqjd(antExChuModel.getYdqjd());
...	...	@@ -937,6 +945,7 @@
937	945	if(null!=antExChuModel.getLastMenses()) {
938	946	setLastMenses(DateUtil.getyyyy_MM_dd(antExChuModel.getLastMenses()));
939	947	}
	948	+ setcDueWeek(antExChuModel.getcDueWeek());
940	949	}
941	950	return this;
942	951	}

...	...	@@ -5,6 +5,7 @@
5	5	import com.lyms.platform.common.utils.DateUtil;
6	6	import com.lyms.platform.pojo.ReferralApplyOrderModel;
7	7
	8	+import java.util.Date;
8	9	import java.util.List;
9	10
10	11	/**
...	...	@@ -175,7 +176,12 @@
175	176	setName(destModel.getName());
176	177	setScore(destModel.getScore());
177	178	setrLevel(destModel.getrLevel());
178		- setDueWeek(destModel.getDueWeek());
	179	+ if(null!=destModel.getDueDate()){
	180	+ int days= DateUtil.daysBetween(new Date(),destModel.getDueDate());
	181	+ String week= (days/7)+"";
	182	+ int day = (days%7);
	183	+ this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
	184	+ }
179	185	setrRisk(destModel.getrRisk());
180	186	setDueDate(DateUtil.getYmd(destModel.getDueDate()));
181	187	setApplyDoctor(destModel.getApplyDoctor());

...	...	@@ -5,6 +5,7 @@
5	5	import com.lyms.platform.common.utils.DateUtil;
6	6	import com.lyms.platform.pojo.ReferralApplyOrderModel;
7	7
	8	+import java.util.Date;
8	9	import java.util.List;
9	10
10	11	/**
...	...	@@ -195,7 +196,12 @@
195	196	setName(destModel.getName());
196	197	setScore(destModel.getScore());
197	198	setrLevel(destModel.getrLevel());
198		- setDueWeek(destModel.getDueWeek());
	199	+ if(null!=destModel.getDueDate()){
	200	+ int days= DateUtil.daysBetween(new Date(),destModel.getDueDate());
	201	+ String week= (days/7)+"";
	202	+ int day = (days%7);
	203	+ this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
	204	+ }
199	205	setrRisk(destModel.getrRisk());
200	206	setDueDate(DateUtil.getYmd(destModel.getDueDate()));
201	207	setApplyDoctor(destModel.getApplyDoctor());

...	...	@@ -230,7 +230,12 @@
230	230	setParentId(destModel.getParentId());
231	231	setName(destModel.getName());
232	232	setAge(destModel.getAge());
233		- setDueWeek(destModel.getDueWeek());
	233	+ if(null!=destModel.getDueDate()){
	234	+ int days= DateUtil.daysBetween(new Date(),destModel.getDueDate());
	235	+ String week= (days/7)+"";
	236	+ int day = (days%7);
	237	+ this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
	238	+ }
234	239	setCardNo(destModel.getCardNo());
235	240	setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
236	241	setrLevel(destModel.getrLevel());