diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java index 66e076b..9ec7bc6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java @@ -41,11 +41,22 @@ public class MatDeliverListResult { //末次月经 private String lastMenses; + //建档类型 0 未分娩建档 1儿童建档时建档 + private String dueType; + // 胎数 private String tireNumber1; private List data = new ArrayList(); + public String getDueType() { + return dueType; + } + + public void setDueType(String dueType) { + this.dueType = dueType; + } + public String getTireNumber1() { return tireNumber1; } @@ -68,6 +79,9 @@ public class MatDeliverListResult { if (null != patients.getDueDate()) { setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); } + if(null!=patients.getBuildType()){ + dueType=0==patients.getBuildType()?"0":"1"; + } setName(patients.getUsername()); setPhone(patients.getPhone()); setRemarks(patients.getMremark()); @@ -177,8 +191,7 @@ public class MatDeliverListResult { private String id; private String checkTime; private String enableEdit = "0"; - //建档类型 0 未分娩建档 1儿童建档时建档 - private String dueType; + //分娩时间,补录时使用 private String dueDate; public MatDeliverExt(MaternalDeliverModel deliverModel, Date lastCreatedTime,Integer buildType,Date dueDate) { @@ -190,9 +203,7 @@ public class MatDeliverListResult { Date date = DateUtil.parseYMD(deliverModel.getDueDate()); setEnableEdit(date.after(lastCreatedTime) ? "1" : "0"); } - if(null!=buildType){ - dueType=0==buildType?"0":"1"; - } + if(null!=dueDate){ this.dueDate=DateUtil.getyyyy_MM_dd(dueDate); } @@ -206,14 +217,6 @@ public class MatDeliverListResult { this.dueDate = dueDate; } - public String getDueType() { - return dueType; - } - - public void setDueType(String dueType) { - this.dueType = dueType; - } - public String getEnableEdit() { return enableEdit; }