Commit cb0455964b713b8cad915fcf7459b8754408de7c
1 parent
36736b29c4
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 27 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java
View file @
cb04559
1 | 1 | package com.lyms.platform.operate.web.result; |
2 | 2 | |
3 | +import scala.util.parsing.combinator.testing.Str; | |
4 | + | |
3 | 5 | import java.util.Date; |
4 | 6 | import java.util.List; |
5 | 7 | import java.util.Map; |
... | ... | @@ -112,6 +114,27 @@ |
112 | 114 | |
113 | 115 | //秦皇岛20211222儿保管理-纠正月龄 |
114 | 116 | private String redressMonth; |
117 | + | |
118 | + //隆化-儿童建档-自动结案 1:未结案 2:已结案 | |
119 | + private Integer settleType; | |
120 | + //隆化-儿童建档-自动结案时间 | |
121 | + private String settleTime; | |
122 | + | |
123 | + public Integer getSettleType() { | |
124 | + return settleType; | |
125 | + } | |
126 | + | |
127 | + public void setSettleType(Integer settleType) { | |
128 | + this.settleType = settleType; | |
129 | + } | |
130 | + | |
131 | + public String getSettleTime() { | |
132 | + return settleTime; | |
133 | + } | |
134 | + | |
135 | + public void setSettleTime(String settleTime) { | |
136 | + this.settleTime = settleTime; | |
137 | + } | |
115 | 138 | |
116 | 139 | public String getRedressMonth() { |
117 | 140 | return redressMonth; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java
View file @
cb04559
... | ... | @@ -246,6 +246,10 @@ |
246 | 246 | result.setVcCardNo(model.getVcCardNo()); |
247 | 247 | //秦皇岛-高危儿详情-替换原诊断列 |
248 | 248 | result.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(model.getQhdHighRiskInfo())?model.getQhdHighRiskInfo():null); |
249 | + //隆化-儿童建档-自动结案 1:未结案 2:已结案 | |
250 | + result.setSettleType(model.getSettleType()); | |
251 | + //隆化-儿童建档-自动结案时间 | |
252 | + result.setSettleTime(DateUtil.getyyyy_MM_dd(model.getSettleTime())); | |
249 | 253 | list.add(result); |
250 | 254 | } |
251 | 255 | } |