jiangjiazhi / regional-platform | GitLab

Commit 17a24c6fb76b18c7891df31d1f1125e2622265f1

Authored by liquanyu over 2 years ago

1 parent 81d76e8fa2

Exists in master and in 6 other branches

肌萎缩

Showing 3 changed files with 13 additions and 2 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmnResult.java

...	...	@@ -1357,7 +1357,7 @@
1357	1357	*/
1358	1358	public static String getWeekDesc(Date start, Date end) {
1359	1359	if (start == null \|\| end == null) {
1360		- return "孕0周+0天";
	1360	+ return "-";
1361	1361	}
1362	1362	Integer betweenDay = DateUtil.getDays(start, end);
1363	1363	Integer week = betweenDay / 7;

...	...	@@ -203,6 +203,8 @@
203	203	{
204	204	SmnResult re = new SmnResult();
205	205	BeanUtils.copyProperties(model, re);
	206	+
	207	+ re.setApplyWeek(DateUtil.getWeekDesc(model.getLastMenses(),model.getSendDate()));
206	208	re.setAddressRegisterStr(CommonsHelper.getResidence(model.getProvinceRegisterId(),
207	209	model.getCityRegisterId(),
208	210	model.getAreaRegisterId(),

...	...	@@ -7,7 +7,16 @@
7	7	public class SmnResult extends SmnModel {
8	8
9	9
10		- private String addressRegisterStr;
	10	+ private String addressRegisterStr; //居住地址
	11	+ private String applyWeek; //申请孕周
	12	+
	13	+ public String getApplyWeek() {
	14	+ return applyWeek;
	15	+ }
	16	+
	17	+ public void setApplyWeek(String applyWeek) {
	18	+ this.applyWeek = applyWeek;
	19	+ }
11	20
12	21	public String getAddressRegisterStr() {
13	22	return addressRegisterStr;