jiangjiazhi / regional-platform

Commit eecd63b3dbbb6d2dac5de0c710ed0c8931a41c78

Authored by jiangjiazhi over 8 years ago

Exists in master and in 8 other branches

修改新电子病历

Showing 7 changed files with 97 additions and 37 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.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
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java

...	...	@@ -41,6 +41,7 @@
41	41	}
42	42
43	43	public static Integer minute2Index(Date date) {
	44	+
44	45	DateTime dt = new DateTime(date.getTime());
45	46	return dt.getMinuteOfDay() / 10;
46	47	}
47	48
...	...	@@ -499,7 +500,59 @@
499	500	return result;
500	501
501	502	}
	503	+ public static int countMonths(Date date1,Date date2) throws ParseException{
502	504
	505	+ /* Calendar c1=Calendar.getInstance();
	506	+ Calendar c2=Calendar.getInstance();
	507	+
	508	+ c1.setTime(date1);
	509	+ c2.setTime(date2);
	510	+
	511	+ int year =c2.get(Calendar.YEAR)-c1.get(Calendar.YEAR);
	512	+ System.out.print(year);
	513	+ //开始日期若小月结束日期
	514	+ if(year<0){
	515	+ year=-year;
	516	+ return year*12+c1.get(Calendar.MONTH)-c2.get(Calendar.MONTH);
	517	+ }*/
	518	+
	519	+// return year*12+c2.get(Calendar.MONTH)-c1.get(Calendar.MONTH);
	520	+ return 0;
	521	+
	522	+
	523	+ }
	524	+ public static int getBabyMonthAge1(Date birth, Date checkDate)
	525	+ {
	526	+ Calendar rightNow = Calendar.getInstance();
	527	+ rightNow.setTime(checkDate);
	528	+ rightNow.add(Calendar.MONTH,-1);
	529	+ if (birth.getTime() > rightNow.getTime().getTime())
	530	+ {
	531	+ return 0;
	532	+ }
	533	+ Calendar rightNow1 = Calendar.getInstance();
	534	+ rightNow1.setTime(checkDate);
	535	+ rightNow1.add(Calendar.YEAR,-1);
	536	+
	537	+
	538	+ if (birth.getTime() > rightNow1.getTime().getTime())
	539	+ {
	540	+
	541	+ int month = getMonthSpace(birth,checkDate);
	542	+ Calendar yearNow = Calendar.getInstance();
	543	+ yearNow.setTime(birth);
	544	+ yearNow.add(Calendar.MONTH,month);
	545	+ return month;
	546	+ }
	547	+ int year = getYearSpace(birth, checkDate);
	548	+ rightNow.setTime(checkDate);
	549	+ rightNow.add(Calendar.YEAR,year);
	550	+
	551	+ int month = getMonthSpace1(birth, rightNow.getTime());
	552	+
	553	+ return year*12+month;
	554	+ }
	555	+
503	556	public static int getMonthSpace1(Date date1, Date date2) {
504	557
505	558	int result = 0;
506	559
...	...	@@ -685,9 +738,8 @@
685	738	// String st = md.format(new Date());
686	739	// System.out.print(st);
687	740
688		- String s = getBabyMonthAge(parseYMD("2013-09-16"), new Date());
	741	+ int s = getBabyMonthAge1(parseYMD("2016-09-07"), new Date());
689	742	System.out.println(s);
690		-
691	743	// Date s = addDay(parseYMD("2016-02-26"), 168);
692	744	// System.out.println(getyyyy_MM_dd(s));
693	745	} catch (Exception e)

...	...	@@ -30,6 +30,8 @@
30	30	private Date birth;
31	31	//申请时间(多少天)
32	32	private Date dueWeek;
	33	+ //月龄的月或者孕周的周
	34	+ private Integer days;
33	35	//末次月经
34	36	private Date lastMenses;
35	37	private String otherHighRisk;
...	...	@@ -81,6 +83,14 @@
81	83	private Integer type;
82	84
83	85	private Integer serviceType;
	86	+
	87	+ public Integer getDays() {
	88	+ return days;
	89	+ }
	90	+
	91	+ public void setDays(Integer days) {
	92	+ this.days = days;
	93	+ }
84	94
85	95	public Integer getpStatus() {
86	96	return pStatus;

...	...	@@ -41,9 +41,9 @@
41	41	//年龄
42	42	private String age;
43	43	//孕周
44		- private Date dueDateStart;
	44	+ private Integer dueDateStart;
45	45	//孕周
46		- private Date dueDateEnd;
	46	+ private Integer dueDateEnd;
47	47	//风险等级
48	48	private String rLevel;
49	49	private Integer scoreStart;
50	50
51	51
52	52
...	...	@@ -271,19 +271,19 @@
271	271	this.id = id;
272	272	}
273	273
274		- public Date getDueDateEnd() {
	274	+ public Integer getDueDateEnd() {
275	275	return dueDateEnd;
276	276	}
277	277
278		- public void setDueDateEnd(Date dueDateEnd) {
	278	+ public void setDueDateEnd(Integer dueDateEnd) {
279	279	this.dueDateEnd = dueDateEnd;
280	280	}
281	281
282		- public Date getDueDateStart() {
	282	+ public Integer getDueDateStart() {
283	283	return dueDateStart;
284	284	}
285	285
286		- public void setDueDateStart(Date dueDateStart) {
	286	+ public void setDueDateStart(Integer dueDateStart) {
287	287	this.dueDateStart = dueDateStart;
288	288	}
289	289
290	290
...	...	@@ -408,14 +408,14 @@
408	408
409	409
410	410	if (null != dueDateStart) {
411		- c = Criteria.where("dueWeek").gte(dueDateStart);
	411	+ c = Criteria.where("days").gte(dueDateStart);
412	412	isAddStart = Boolean.TRUE;
413	413	}
414	414	if (null != dueDateEnd) {
415	415	if (isAddStart) {
416	416	c = c.lte(dueDateEnd);
417	417	} else {
418		- c = Criteria.where("dueWeek").lte(dueDateEnd);
	418	+ c = Criteria.where("days").lte(dueDateEnd);
419	419	}
420	420	isAddStart = Boolean.TRUE;
421	421	}

...	...	@@ -129,9 +129,11 @@
129	129	}
130	130	}
131	131	referralApplyOrderModel.setrLevel(lsit);
132		-// referralApplyOrderModel.setOtherHighRisk(highScoreResult.getOtherHigh());
133	132	referralApplyOrderModel.setPid(patients.getPid());
134	133	referralApplyOrderModel.setDueWeek(new Date());
	134	+ days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
	135	+
	136	+ referralApplyOrderModel.setDays(days/7);
135	137	referralApplyOrderModel.setpStatus(2);
136	138	if(null!=patients.getFmDate()){
137	139	referralApplyOrderModel.setpStatus(1);
138	140
...	...	@@ -181,8 +183,8 @@
181	183	id = babyModel.getId();
182	184	if (null != babyModel.getBirth()) {
183	185	referralApplyOrderModel.setAge(DateUtil.getAge(babyModel.getBirth()));
184		-// referralApplyOrderModel.setDueWeek(DateUtil.getDays(babyModel.getBirth(), new Date()));
185	186	}
	187	+ referralApplyOrderModel.setDays(DateUtil.getBabyMonthAge1(babyModel.getBirth(), new Date()));
186	188	referralApplyOrderModel.setDueWeek(new Date());
187	189	Patients patients = patientsService.findOnePatientById(babyModel.getParentId());
188	190	referralApplyOrderModel.setParentId(babyModel.getId());
...	...	@@ -472,8 +474,7 @@
472	474	referralApplyOrderQuery.setBirthEnd(new Date(DateUtil.parseYMD(str[1]).getTime() + 86398000));
473	475	}
474	476	}
475		- Date currentDate = DateUtil.formatDate(new Date());
476		- if (StringUtils.isNotEmpty(applyOrderQueryRequest.getYlStart())) {
	477	+ if (null!=applyOrderQueryRequest.getYlStart()) {
477	478	/* Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart());
478	479	Date end = DateUtil.addMonth(currentDate, -request.getMonthAgeEnd()-1);
479	480
480	481
481	482
...	...	@@ -483,12 +484,12 @@
483	484	Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -request.getMonthAgeEnd() - 1),1);
484	485	babyQuery.setBirthStart(end);
485	486	babyQuery.setBirthEnd(start);*/
486		- Date date= DateUtil.addMonth(currentDate, -NumberUtils.toInt(applyOrderQueryRequest.getYlStart()));
487	487
488		- referralApplyOrderQuery.setDueDateEnd(date);
	488	+// referralApplyOrderQuery.setDueDateEnd(date);
	489	+ referralApplyOrderQuery.setDueDateStart(applyOrderQueryRequest.getYlStart());
489	490	}
490		- if (StringUtils.isNotEmpty(applyOrderQueryRequest.getYlEnd())) {
491		- referralApplyOrderQuery.setDueDateStart(DateUtil.addDay(DateUtil.addMonth(currentDate, -NumberUtils.toInt(applyOrderQueryRequest.getYlEnd())-1),1));
	491	+ if (null!=applyOrderQueryRequest.getYlEnd()) {
	492	+ referralApplyOrderQuery.setDueDateEnd(applyOrderQueryRequest.getYlEnd());
492	493	}
493	494
494	495	List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
495	496
496	497
...	...	@@ -566,14 +567,12 @@
566	567	referralApplyOrderQuery.setBirthEnd(date);
567	568	}
568	569	//根据孕周
569		- if (null != applyOrderQueryRequest.getEndDueWeek() && NumberUtils.isNumber(applyOrderQueryRequest.getEndDueWeek())) {
570		- Date end= DateUtil.addDay(DateUtil.addWeek(currentDate, NumberUtils.toInt(applyOrderQueryRequest.getEndDueWeek())), 6);
571		- referralApplyOrderQuery.setDueDateEnd(end);
	570	+ if (null != applyOrderQueryRequest.getEndDueWeek()) {
	571	+ referralApplyOrderQuery.setDueDateEnd(applyOrderQueryRequest.getEndDueWeek());
572	572	}
573	573	if (null != applyOrderQueryRequest.getStartDueWeek()) {
574		- Date end= DateUtil.addWeek(currentDate, NumberUtils.toInt(applyOrderQueryRequest.getEndDueWeek()));
575	574	// int i = NumberUtils.toInt(applyOrderQueryRequest.getStartDueWeek()) * 7;
576		- referralApplyOrderQuery.setDueDateStart(end);
	575	+ referralApplyOrderQuery.setDueDateStart( applyOrderQueryRequest.getStartDueWeek());
577	576	}
578	577
579	578	if (null != applyOrderQueryRequest.getStartScore()) {

...	...	@@ -32,9 +32,9 @@
32	32	private Integer endAge;
33	33	private Integer startAge;
34	34	//孕周
35		- private String startDueWeek;
	35	+ private Integer startDueWeek;
36	36
37		- private String endDueWeek;
	37	+ private Integer endDueWeek;
38	38
39	39	//风险等级
40	40	private String rLevel;
41	41
42	42
43	43
...	...	@@ -117,20 +117,19 @@
117	117	}
118	118
119	119
120		-
121		- public String getEndDueWeek() {
	120	+ public Integer getEndDueWeek() {
122	121	return endDueWeek;
123	122	}
124	123
125		- public void setEndDueWeek(String endDueWeek) {
	124	+ public void setEndDueWeek(Integer endDueWeek) {
126	125	this.endDueWeek = endDueWeek;
127	126	}
128	127
129		- public String getStartDueWeek() {
	128	+ public Integer getStartDueWeek() {
130	129	return startDueWeek;
131	130	}
132	131
133		- public void setStartDueWeek(String startDueWeek) {
	132	+ public void setStartDueWeek(Integer startDueWeek) {
134	133	this.startDueWeek = startDueWeek;
135	134	}
136	135

...	...	@@ -15,11 +15,11 @@
15	15	//儿童姓名
16	16	private String name;
17	17	//月龄开始
18		- private String ylStart;
	18	+ private Integer ylStart;
19	19	//联系方式
20	20	private String phone;
21	21	//月龄结束
22		- private String ylEnd;
	22	+ private Integer ylEnd;
23	23	//高危id
24	24	private String highRisk;
25	25	//预约检查日期
26	26
27	27
28	28
...	...	@@ -136,19 +136,19 @@
136	136	this.tyVip = tyVip;
137	137	}
138	138
139		- public String getYlEnd() {
	139	+ public Integer getYlEnd() {
140	140	return ylEnd;
141	141	}
142	142
143		- public void setYlEnd(String ylEnd) {
	143	+ public void setYlEnd(Integer ylEnd) {
144	144	this.ylEnd = ylEnd;
145	145	}
146	146
147		- public String getYlStart() {
	147	+ public Integer getYlStart() {
148	148	return ylStart;
149	149	}
150	150
151		- public void setYlStart(String ylStart) {
	151	+ public void setYlStart(Integer ylStart) {
152	152	this.ylStart = ylStart;
153	153	}
154	154	}

...	...	@@ -135,7 +135,7 @@
135	135	setCyl(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(referralApplyOrderModel.getBirth(), new Date())));
136	136	}
137	137	if (null != referralApplyOrderModel.getBirth()) {
138		- setYl(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getBabyMonthAge(referralApplyOrderModel.getBirth(), referralApplyOrderModel.getCreated())));
	138	+ setYl(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getBabyMonthAge(referralApplyOrderModel.getBirth(), referralApplyOrderModel.getDueWeek())));
139	139	}
140	140	if (null != referralApplyOrderModel.getCreated()) {
141	141	setCreated(DateUtil.getyyyy_MM_dd(referralApplyOrderModel.getCreated()));