jiangjiazhi / regional-platform

Commit 7bdb7e298fb3bf42c8f448dfac603eabbff0215e

Authored by yangfei almost 7 years ago

Exists in master and in 6 other branches

月经停留周期

Showing 10 changed files with 146 additions and 7 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.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/AntexListResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java

...	...	@@ -42,6 +42,14 @@
42	42
43	43	// 月经周期开始天数
44	44	private String mensEndDay;
	45	+
	46	+ // 月经停留开始天数
	47	+ private String mensStopStartDay;
	48	+
	49	+ // 月经停留开始天数
	50	+ private String mensStopEndDay;
	51	+
	52	+
45	53	// 初诊复诊发送推送消息时间
46	54	private Date sendMsgTime;
47	55	/**
...	...	@@ -314,6 +322,22 @@
314	322
315	323	public void setMensStartDay(String mensStartDay) {
316	324	this.mensStartDay = mensStartDay;
	325	+ }
	326	+
	327	+ public String getMensStopStartDay() {
	328	+ return mensStopStartDay;
	329	+ }
	330	+
	331	+ public void setMensStopStartDay(String mensStopStartDay) {
	332	+ this.mensStopStartDay = mensStopStartDay;
	333	+ }
	334	+
	335	+ public String getMensStopEndDay() {
	336	+ return mensStopEndDay;
	337	+ }
	338	+
	339	+ public void setMensStopEndDay(String mensStopEndDay) {
	340	+ this.mensStopEndDay = mensStopEndDay;
317	341	}
318	342
319	343	public String getSendCareMan() {

...	...	@@ -696,7 +696,7 @@
696	696	JSONObject antChuJson = new JSONObject();
697	697	//月经周期
698	698	String mensDay = "";
699		- if (patients.getMensEndDay() != null) {
	699	+ if (patients.getMensStartDay() != null) {
700	700	mensDay = StringUtils.unitHandle(patients.getMensStartDay(), UnitConstants.DAY);
701	701	}
702	702
...	...	@@ -706,6 +706,20 @@
706	706	}
707	707	mensDay += StringUtils.unitHandle(patients.getMensEndDay(), UnitConstants.DAY);
708	708	}
	709	+
	710	+ //月经周期
	711	+ String mensStopDay = "";
	712	+ if (patients.getMensStopStartDay() != null) {
	713	+ mensStopDay = StringUtils.unitHandle(patients.getMensStopStartDay(), UnitConstants.DAY);
	714	+ }
	715	+
	716	+ if (patients.getMensStopEndDay() != null) {
	717	+ if (StringUtils.isNotEmpty(mensStopDay)) {
	718	+ mensStopDay += " - ";
	719	+ }
	720	+ mensStopDay += StringUtils.unitHandle(patients.getMensStopEndDay(), UnitConstants.DAY);
	721	+ }
	722	+
709	723	antChuJson.put("mensDay", mensDay);
710	724	//诊断时间
711	725	antChuJson.put("checkTime", DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime()));

...	...	@@ -14,7 +14,6 @@
14	14	import com.lyms.platform.operate.web.request.*;
15	15	import com.lyms.platform.operate.web.result.*;
16	16	import com.lyms.platform.operate.web.service.ITrackDownService;
17		-import com.lyms.platform.operate.web.utils.FunvCommonUtil;
18	17	import com.lyms.platform.operate.web.utils.InitDataUtils;
19	18	import com.lyms.platform.operate.web.utils.MongoUtil;
20	19	import com.lyms.platform.operate.web.utils.ResolveUtils;
...	...	@@ -33,9 +32,6 @@
33	32	import org.apache.commons.collections.map.HashedMap;
34	33	import org.apache.commons.lang.StringUtils;
35	34	import org.apache.commons.lang.math.NumberUtils;
36		-import org.dom4j.Document;
37		-import org.dom4j.DocumentHelper;
38		-import org.dom4j.Element;
39	35	import org.slf4j.Logger;
40	36	import org.slf4j.LoggerFactory;
41	37	import org.springframework.beans.factory.annotation.Autowired;
...	...	@@ -48,7 +44,6 @@
48	44	import org.springframework.stereotype.Component;
49	45	import org.springframework.util.StopWatch;
50	46
51		-import java.io.UnsupportedEncodingException;
52	47	import java.util.*;
53	48	import java.util.regex.Pattern;
54	49
...	...	@@ -2898,7 +2893,7 @@
2898	2893	if (patients != null) {
2899	2894	//月经周期
2900	2895	String mensDay = "";
2901		- if (patients.getMensEndDay() != null) {
	2896	+ if (patients.getMensStartDay() != null) {
2902	2897	mensDay = patients.getMensStartDay();
2903	2898	}
2904	2899
...	...	@@ -2909,6 +2904,22 @@
2909	2904	mensDay += patients.getMensEndDay();
2910	2905	}
2911	2906	antexChuResult.setMensDay(mensDay);
	2907	+
	2908	+ //月经周期
	2909	+ String mensStopDay = "";
	2910	+ if (patients.getMensStopStartDay() != null) {
	2911	+ mensStopDay = patients.getMensStopStartDay();
	2912	+ }
	2913	+
	2914	+ if (patients.getMensStopEndDay() != null) {
	2915	+ if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(mensStopDay)) {
	2916	+ mensStopDay += " - ";
	2917	+ }
	2918	+ mensStopDay += patients.getMensStopEndDay();
	2919	+ }
	2920	+ antexChuResult.setMensStopDay(mensStopDay);
	2921	+
	2922	+
2912	2923	antexChuResult.setVcCardNo(patients.getVcCardNo());
2913	2924	}
2914	2925

...	...	@@ -1180,6 +1180,10 @@
1180	1180
1181	1181	patient.setMensEndDay(yunRequest.getMensEndDay());
1182	1182
	1183	+ patient.setMensStopStartDay(yunRequest.getMensStopStartDay());
	1184	+
	1185	+ patient.setMensStopEndDay(yunRequest.getMensStopEndDay());
	1186	+
1183	1187	patient.setUsername(yunRequest.getPregnantName());
1184	1188
1185	1189	patient.setPcerteTypeId(yunRequest.getPregnantCertificateTypeId());
...	...	@@ -1373,6 +1377,9 @@
1373	1377
1374	1378	result.setMensStartDay(p.getMensStartDay());
1375	1379	result.setMensEndDay(p.getMensEndDay());
	1380	+
	1381	+ result.setMensStopStartDay(p.getMensStopStartDay());
	1382	+ result.setMensStopEndDay(p.getMensStopEndDay());
1376	1383
1377	1384	/** 是否发放过优惠券 */
1378	1385	result.setSendCoupon(p.isSendCoupon() == null ? false : p.isSendCoupon());

...	...	@@ -752,6 +752,8 @@
752	752	jsonObject.put("perType", ps.getPerType());
753	753	//指定医生
754	754	jsonObject.put("serDoct", ps.getSerDoct() == null ? "" : ps.getSerDoct());
	755	+ //开通医生
	756	+ jsonObject.put("createUser", ps.getCreateUser() == null ? "" : ps.getCreateUser());
755	757	//服务状态
756	758	jsonObject.put("serStatus", ps.getSerStatus());
757	759	jsonObject.put("hospitalId", ps.getHospitalId());

...	...	@@ -172,6 +172,9 @@
172	172	map.put("mensStartDay", data.getMensStartDay());
173	173	map.put("mensEndDay", data.getMensEndDay());
174	174
	175	+ map.put("mensStopStartDay", data.getMensStopStartDay());
	176	+ map.put("mensStopEndDay", data.getMensStopEndDay());
	177	+
175	178	map.put("id", data.getId());
176	179	/* 孕妇基础数据 */
177	180	map.put("username", data.getUsername());

...	...	@@ -158,6 +158,28 @@
158	158	// 月经周期开始天数
159	159	private String mensEndDay;
160	160
	161	+ // 月经停留开始天数
	162	+ private String mensStopStartDay;
	163	+
	164	+ // 月经停留开始天数
	165	+ private String mensStopEndDay;
	166	+
	167	+ public String getMensStopStartDay() {
	168	+ return mensStopStartDay;
	169	+ }
	170	+
	171	+ public void setMensStopStartDay(String mensStopStartDay) {
	172	+ this.mensStopStartDay = mensStopStartDay;
	173	+ }
	174	+
	175	+ public String getMensStopEndDay() {
	176	+ return mensStopEndDay;
	177	+ }
	178	+
	179	+ public void setMensStopEndDay(String mensStopEndDay) {
	180	+ this.mensStopEndDay = mensStopEndDay;
	181	+ }
	182	+
161	183	public List<Map<String, String>> getSerInfos() {
162	184	return serInfos;
163	185	}

...	...	@@ -186,6 +186,8 @@
186	186	private String bg;
187	187	// 月经周期开始天数
188	188	private String mensDay;
	189	+ // 月经周期开始天数
	190	+ private String mensStopDay;
189	191
190	192	/**
191	193	* 初检信息
...	...	@@ -512,6 +514,14 @@
512	514
513	515	public void setThyStim(Map thyStim) {
514	516	this.thyStim = thyStim;
	517	+ }
	518	+
	519	+ public String getMensStopDay() {
	520	+ return mensStopDay;
	521	+ }
	522	+
	523	+ public void setMensStopDay(String mensStopDay) {
	524	+ this.mensStopDay = mensStopDay;
515	525	}
516	526
517	527	public String getAntGlan() {

...	...	@@ -332,6 +332,8 @@
332	332	}
333	333	setMensEndDay(patients.getMensEndDay());
334	334	setMensStartDay(patients.getMensStartDay());
	335	+ setMensStopEndDay(patients.getMensStopEndDay());
	336	+ setMensStopStartDay(patients.getMensStopStartDay());
335	337	setFuckLastMens(DateUtil.getyyyy_MM_dd(patients.getFuckLastMens()));
336	338	}
337	339	return this;
...	...	@@ -342,6 +344,28 @@
342	344	*/
343	345	private String mensStartDay;
344	346	private String mensEndDay;
	347	+
	348	+ /**
	349	+ * 月经周期
	350	+ */
	351	+ private String mensStopStartDay;
	352	+ private String mensStopEndDay;
	353	+
	354	+ public String getMensStopStartDay() {
	355	+ return mensStopStartDay;
	356	+ }
	357	+
	358	+ public void setMensStopStartDay(String mensStopStartDay) {
	359	+ this.mensStopStartDay = mensStopStartDay;
	360	+ }
	361	+
	362	+ public String getMensStopEndDay() {
	363	+ return mensStopEndDay;
	364	+ }
	365	+
	366	+ public void setMensStopEndDay(String mensStopEndDay) {
	367	+ this.mensStopEndDay = mensStopEndDay;
	368	+ }
345	369
346	370	private String fuckLastMens;
347	371

...	...	@@ -138,6 +138,28 @@
138	138	// 月经周期开始天数
139	139	private String mensEndDay;
140	140
	141	+ // 月经停留开始天数
	142	+ private String mensStopStartDay;
	143	+
	144	+ // 月经停留开始天数
	145	+ private String mensStopEndDay;
	146	+
	147	+ public String getMensStopStartDay() {
	148	+ return mensStopStartDay;
	149	+ }
	150	+
	151	+ public void setMensStopStartDay(String mensStopStartDay) {
	152	+ this.mensStopStartDay = mensStopStartDay;
	153	+ }
	154	+
	155	+ public String getMensStopEndDay() {
	156	+ return mensStopEndDay;
	157	+ }
	158	+
	159	+ public void setMensStopEndDay(String mensStopEndDay) {
	160	+ this.mensStopEndDay = mensStopEndDay;
	161	+ }
	162	+
141	163	public String getMensEndDay() {
142	164	return mensEndDay;
143	165	}