jiangjiazhi / regional-platform | GitLab

Commit e81d85c7d12bb9f918e805a35222cf7237062de0

Authored by shiyang over 3 years ago

1 parent 17cd605eef

Exists in master and in 6 other branches

孕产体重临时列表年龄是0的bug

Showing 3 changed files with 19 additions and 3 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java

...	...	@@ -217,7 +217,7 @@
217	217
218	218	public static Integer getAge(Date birth) {
219	219	if (null == birth) {
220		- return 0;
	220	+ return null;
221	221	}
222	222	java.util.Calendar calendar = Calendar.getInstance();
223	223	Date date = new Date();

...	...	@@ -203,7 +203,15 @@
203	203	requestMap.put("riskScore", riskScore);
204	204	requestMap.put("riskFactor", listMap);
205	205	requestMap.put("userName", bloodModel.getUserName());
206		- requestMap.put("age", DateUtil.getAge(bloodModel.getBirth()));
	206	+ Integer age=null;
	207	+ if(null==DateUtil.getAge(bloodModel.getBirth())){
	208	+ //用身份证得到年龄
	209	+ age=StringUtils.getAgeByCertId(bloodModel.getCardID());
	210	+ }else {
	211	+ //用生日得到年龄
	212	+ age=DateUtil.getAge(bloodModel.getBirth());
	213	+ }
	214	+ requestMap.put("age", age);
207	215	requestMap.put("weeks", DateUtil.getWeekDesc(bloodModel.getLastMenses(), new Date()));
208	216	requestMap.put("phone", bloodModel.getPhone());
209	217	requestMap.put("id", bloodModel.getId());

...	...	@@ -315,7 +315,15 @@
315	315	Map<String, Object> temp = new LinkedHashMap<>();
316	316	temp.put("id", patientWeight.getId());
317	317	temp.put("userName", temporaryUser.getUserName());
318		- temp.put("age", null!=DateUtil.getAge(temporaryUser.getBirth())?DateUtil.getAge(temporaryUser.getBirth()):"");
	318	+ Integer uage=null;
	319	+ if(null==DateUtil.getAge(temporaryUser.getBirth())){
	320	+ //用身份证得到年龄
	321	+ uage=com.lyms.platform.common.utils.StringUtils.getAgeByCertId(temporaryUser.getCardID());
	322	+ }else {
	323	+ //用生日得到年龄
	324	+ uage=DateUtil.getAge(temporaryUser.getBirth());
	325	+ }
	326	+ temp.put("age", uage);
319	327	temp.put("phone", temporaryUser.getPhone());
320	328	//末次月经
321	329	Date dueDate = DateUtil.addDay(temporaryUser.getLastMenses(), 280);