diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java index fac03b9..0a98f33 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java @@ -290,7 +290,11 @@ public class BabySieveFacede { for(MaternalDeliverModel maternalDeliverModel : maternalDeliverModelList){ for(BabyModel babyModel : babyModelList){ if(maternalDeliverModel.getParentId().equals(babyModel.getParentId())){ + BabySieveModel babySieveModel = new BabySieveModel(); + babySieveModel = babySieveService.getBabySieveQueryBybabyId(babyModel.getId()); BabySieveManager babySieveManager = new BabySieveManager(); + babySieveManager.setMatdeliverId(maternalDeliverModel.getId()); + babySieveManager.setId(babySieveModel.getId()); //获取母亲基本信息 Patients patients = patientsService.findOnePatientById(babyModel.getParentId()); //获取高危因素,高危评分 @@ -300,12 +304,16 @@ public class BabySieveFacede { if(null != patients.getDueDate()){ babySieveManager.setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); } + babySieveManager.setPatientId(patients.getId()); + babySieveManager.setCardNo(patients.getCardNo()); + babySieveManager.setPhone(patients.getPhone()); + babySieveManager.setBabyId(babyModel.getId()); List babies = maternalDeliverModel.getBaby(); if (CollectionUtils.isNotEmpty(babies)) { for (MaternalDeliverModel.Baby baby : babies) { if(baby.getId() != null && baby.getId().equals(babyModel.getId())){ if(maternalDeliverModel.getDueWeek() != null){ - babySieveManager.setDueWeek(Integer.parseInt(maternalDeliverModel.getDueWeek().substring(0, 1))); + babySieveManager.setDueWeek(maternalDeliverModel.getDueWeek()); } String time = baby.getDueTime(); if(StringUtils.isNotEmpty(time)){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveManager.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveManager.java index 9876b15..5d6a13b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveManager.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveManager.java @@ -8,6 +8,24 @@ import java.util.List; */ public class BabySieveManager { + //儿童建档ID + private String babyId; + + //母亲ID + private String patientId; + + //新生儿筛查ID + private String id; + + //分娩ID + private String matdeliverId; + + //母亲身份证号 + private String cardNo; + + //母亲手机号 + private String phone; + //分娩日期 private String birthYMD; @@ -35,7 +53,7 @@ public class BabySieveManager { private String yChanQi; //分娩孕周 - private Integer dueWeek; + private String dueWeek; //分娩方式 private String dueType; @@ -49,6 +67,54 @@ public class BabySieveManager { //母亲姓名 private String mName; + public String getBabyId() { + return babyId; + } + + public void setBabyId(String babyId) { + this.babyId = babyId; + } + + public String getPatientId() { + return patientId; + } + + public void setPatientId(String patientId) { + this.patientId = patientId; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMatdeliverId() { + return matdeliverId; + } + + public void setMatdeliverId(String matdeliverId) { + this.matdeliverId = matdeliverId; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + public List getRiskFactor() { return riskFactor; } @@ -121,11 +187,11 @@ public class BabySieveManager { this.highRisk = highRisk; } - public Integer getDueWeek() { + public String getDueWeek() { return dueWeek; } - public void setDueWeek(Integer dueWeek) { + public void setDueWeek(String dueWeek) { this.dueWeek = dueWeek; }