Commit 9e82586ca030af5b9df69a9d63150192c02e9911
1 parent
3911b94235
Exists in
master
and in
6 other branches
秦皇岛-儿童管理-早产儿管理列表
Showing 4 changed files with 31 additions and 1 deletions
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
9e82586
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java
View file @
9e82586
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java
View file @
9e82586
... | ... | @@ -110,6 +110,17 @@ |
110 | 110 | |
111 | 111 | private Integer chkCnt;//就诊次数 |
112 | 112 | |
113 | + //秦皇岛20211222儿保管理-纠正月龄 | |
114 | + private String redressMonth; | |
115 | + | |
116 | + public String getRedressMonth() { | |
117 | + return redressMonth; | |
118 | + } | |
119 | + | |
120 | + public void setRedressMonth(String redressMonth) { | |
121 | + this.redressMonth = redressMonth; | |
122 | + } | |
123 | + | |
113 | 124 | public Integer getChkCnt() { |
114 | 125 | return chkCnt; |
115 | 126 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java
View file @
9e82586
... | ... | @@ -21,6 +21,7 @@ |
21 | 21 | import org.apache.commons.collections.CollectionUtils; |
22 | 22 | |
23 | 23 | import java.util.ArrayList; |
24 | +import java.util.Calendar; | |
24 | 25 | import java.util.Date; |
25 | 26 | import java.util.List; |
26 | 27 | import java.util.concurrent.Callable; |
... | ... | @@ -108,6 +109,21 @@ |
108 | 109 | result.setHighRiskInfo(highRiskInfos); |
109 | 110 | result.setWeakSon(model.getWeakSon() == null ? "否" : model.getWeakSon() == 1 ? "是" : "否"); |
110 | 111 | result.setDueWeek(model.getDueWeek()); |
112 | + //秦皇岛20121222纠正月龄 | |
113 | + if(model.getDueWeek()!=null&&model.getDueWeek()<37&&model.getHospitalId().equals("216")){ | |
114 | + String redressMonth=""; | |
115 | + Date dueDate=DateUtil.addDay(DateUtil.addDay(model.getBirth(), -(model.getDueWeek()*7)+(model.getDueDay()==null?0:model.getDueDay())),280); | |
116 | + if(dueDate.after(new Date())){ | |
117 | + Date lastMenses= DateUtil.addDay(model.getBirth(), -(model.getDueWeek()*7)+(model.getDueDay()==null?0:model.getDueDay())); | |
118 | + Long week=(new Date().getTime()-lastMenses.getTime())/(7*24*60*60*1000); | |
119 | + Long day=(new Date().getTime()-lastMenses.getTime())/(24*60*60*1000)%7; | |
120 | + redressMonth="孕"+week.toString()+"周"+day+"天"; | |
121 | + }else { | |
122 | + redressMonth= DateUtil.getBabyMonthAge(dueDate,new Date()); | |
123 | + } | |
124 | + | |
125 | + result.setRedressMonth(redressMonth); | |
126 | + } | |
111 | 127 | if (StringUtils.isNotEmpty(model.getLastCheckDoctor())) |
112 | 128 | { |
113 | 129 | try { |