From 070d5f43358845233a51d3ecbe0b520ad94f6e81 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 14 Sep 2020 16:19:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=90=8C=E6=A1=A3=E6=A1=88=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/common/Test.java | 3 --- .../main/java/com/lyms/platform/pojo/Patients.java | 7 +++--- .../platform/operate/web/facade/ViewFacade.java | 26 ++++++++++++++++++++++ .../web/request/YunBookbuildingAddRequest.java | 6 ++--- .../operate/web/result/PregnantInfoResult.java | 6 ++--- 5 files changed, 36 insertions(+), 12 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/Test.java b/platform-common/src/main/java/com/lyms/platform/common/Test.java index 01973bd..875a1f6 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/Test.java +++ b/platform-common/src/main/java/com/lyms/platform/common/Test.java @@ -8,9 +8,6 @@ import java.util.Date; public class Test { public static void main(String[] args) { - String fmWeekStr = "37+2"; - Date da = DateUtil.parseYMD("0001-01-01"); - System.out.println(da); } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 1334313..9466a3f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -9,6 +9,7 @@ import org.springframework.data.mongodb.core.mapping.Field; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Objects; @@ -345,7 +346,7 @@ public class Patients extends BaseModel { private Integer marriageCheck; //避孕方式 1 未避孕 2口服避孕药 3避孕套 4避孕膜 5其他 - private Integer contraceptionType; + private List> contraceptionType; private String contraceptionOther; //丈夫婚姻状态 1初婚 2 再婚 3其他 @@ -407,11 +408,11 @@ public class Patients extends BaseModel { this.marriageCheck = marriageCheck; } - public Integer getContraceptionType() { + public List> getContraceptionType() { return contraceptionType; } - public void setContraceptionType(Integer contraceptionType) { + public void setContraceptionType(List> contraceptionType) { this.contraceptionType = contraceptionType; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index b0980f1..bbe0f19 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -474,6 +474,32 @@ public class ViewFacade { map.put("numberCode", data.getNumberCode() == null ? "" : data.getNumberCode()); map.put("normal", (data.getNormal() == null || "1".equals(data.getNormal())) ? "正常" : "补录"); + + map.put("marriageAge",data.getMarriageAge() == null ? "" : data.getMarriageAge()); + map.put("LevelType",getBasicConfig(data.getLevelTypeId())); + map.put("marriageStatus",data.getMarriageStatus() == null ? "" : data.getMarriageStatus() == 1 ? "初婚" : (data.getMarriageStatus() == 2 ? "再婚" : "其他")); + map.put("marriageCheck",data.getMarriageCheck() == null ? "" : data.getMarriageCheck() == 1 ? "是" : "否"); + String contraceptionType = ""; + if (data.getContraceptionType() != null) + { + StringBuilder sb = new StringBuilder(); + sb.append(data.getContraceptionType().get(0).get("wby") == true ? "未避孕 " : ""); + sb.append(data.getContraceptionType().get(0).get("kfbyy") == true ? "口服避孕药 " : ""); + sb.append(data.getContraceptionType().get(0).get("byt") == true ? "避孕套 " : ""); + sb.append(data.getContraceptionType().get(0).get("bym") == true ? "避孕膜 " : ""); + sb.append(data.getContraceptionType().get(0).get("qt") == true ? data.getContraceptionOther()+" " : ""); + } + map.put("contraceptionType",contraceptionType); + map.put("hmarriageStatus",data.getHmarriageStatus() == null ? "" : data.getHmarriageStatus() == 1 ? "初婚" : (data.getHmarriageStatus() == 2 ? "再婚" : "其他")); + map.put("healthStatus",data.getHealthStatus()); + map.put("smoke",data.getSmoke() == null ? "" : data.getSmoke() == 1 ? "否" : "是"); + map.put("smokeNum",(data.getSmoke() == null && data.getSmoke() == 2) ? data.getSmokeNum() : ""); + map.put("drinkWine",data.getDrinkWine() == null ? "" : data.getDrinkWine() == 1 ? "偶尔" : (data.getDrinkWine() == 2 ? "经常" : "否")); + map.put("hLevelType",getBasicConfig(data.getHlevelTypeId())); + map.put("pastHistory",data.getPastHistory() == null ? "" : data.getPastHistory()); + map.put("familyHistory",data.getFamilyHistory() == null ? "" : data.getFamilyHistory()); + map.put("other",data.getOther() == null ? "" :data.getOther()); + return map; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index 3b52c7b..cad9239 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -395,7 +395,7 @@ public class YunBookbuildingAddRequest { private Integer marriageCheck; //避孕方式 1 未避孕 2口服避孕药 3避孕套 4避孕膜 5其他 - private Integer contraceptionType; + private List> contraceptionType; private String contraceptionOther; //丈夫婚姻状态 1初婚 2 再婚 3其他 @@ -458,11 +458,11 @@ public class YunBookbuildingAddRequest { this.marriageCheck = marriageCheck; } - public Integer getContraceptionType() { + public List> getContraceptionType() { return contraceptionType; } - public void setContraceptionType(Integer contraceptionType) { + public void setContraceptionType(List> contraceptionType) { this.contraceptionType = contraceptionType; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java index 1b93dd2..23347a8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java @@ -357,7 +357,7 @@ public class PregnantInfoResult { private Integer marriageCheck; //避孕方式 1 未避孕 2口服避孕药 3避孕套 4避孕膜 5其他 - private Integer contraceptionType; + private List> contraceptionType; private String contraceptionOther; //丈夫婚姻状态 1初婚 2 再婚 3其他 @@ -419,11 +419,11 @@ public class PregnantInfoResult { this.marriageCheck = marriageCheck; } - public Integer getContraceptionType() { + public List> getContraceptionType() { return contraceptionType; } - public void setContraceptionType(Integer contraceptionType) { + public void setContraceptionType(List> contraceptionType) { this.contraceptionType = contraceptionType; } -- 1.8.3.1