diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java index 94af023..d667adb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java @@ -1,5 +1,7 @@ package com.lyms.platform.operate.web.result; +import scala.util.parsing.combinator.testing.Str; + import java.util.Date; import java.util.List; import java.util.Map; @@ -113,6 +115,27 @@ public class BabyManageListResult { //秦皇岛20211222儿保管理-纠正月龄 private String redressMonth; + //隆化-儿童建档-自动结案 1:未结案 2:已结案 + private Integer settleType; + //隆化-儿童建档-自动结案时间 + private String settleTime; + + public Integer getSettleType() { + return settleType; + } + + public void setSettleType(Integer settleType) { + this.settleType = settleType; + } + + public String getSettleTime() { + return settleTime; + } + + public void setSettleTime(String settleTime) { + this.settleTime = settleTime; + } + public String getRedressMonth() { return redressMonth; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java index 3b7a21d..679b01f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java @@ -246,6 +246,10 @@ public class BabyListTask implements Callable { result.setVcCardNo(model.getVcCardNo()); //秦皇岛-高危儿详情-替换原诊断列 result.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(model.getQhdHighRiskInfo())?model.getQhdHighRiskInfo():null); + //隆化-儿童建档-自动结案 1:未结案 2:已结案 + result.setSettleType(model.getSettleType()); + //隆化-儿童建档-自动结案时间 + result.setSettleTime(DateUtil.getyyyy_MM_dd(model.getSettleTime())); list.add(result); } }