diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java index 5591ea7..4dc7236 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java @@ -67,13 +67,13 @@ public class MaternalDeliverModel { // 脉搏 private String pulse; // 一小时失血量 - private Integer oHloseBloodL; + private Double oHloseBloodL; //二小时失血量 - private Integer tHloseBloodL; + private Double tHloseBloodL; //二十四小时失血量 - private Integer rHloseBloodL; + private Double rHloseBloodL; //第3产层+产后失血量 - private Integer sHloseBloodL; + private Double sHloseBloodL; //失血原因 private String loseBloodCause; //产科并发症 @@ -568,30 +568,38 @@ public class MaternalDeliverModel { this.pulse = pulse; } - public Integer getoHloseBloodL() { + public Double getoHloseBloodL() { return oHloseBloodL; } - public void setoHloseBloodL(Integer oHloseBloodL) { + public void setoHloseBloodL(Double oHloseBloodL) { this.oHloseBloodL = oHloseBloodL; } - public Integer getrHloseBloodL() { + public Double getrHloseBloodL() { return rHloseBloodL; } - public void setrHloseBloodL(Integer rHloseBloodL) { + public void setrHloseBloodL(Double rHloseBloodL) { this.rHloseBloodL = rHloseBloodL; } - public Integer getsHloseBloodL() { + public Double getsHloseBloodL() { return sHloseBloodL; } - public void setsHloseBloodL(Integer sHloseBloodL) { + public void setsHloseBloodL(Double sHloseBloodL) { this.sHloseBloodL = sHloseBloodL; } + public Double gettHloseBloodL() { + return tHloseBloodL; + } + + public void settHloseBloodL(Double tHloseBloodL) { + this.tHloseBloodL = tHloseBloodL; + } + public Integer getSiLielevel() { return siLielevel; } @@ -600,13 +608,6 @@ public class MaternalDeliverModel { this.siLielevel = siLielevel; } - public Integer gettHloseBloodL() { - return tHloseBloodL; - } - - public void settHloseBloodL(Integer tHloseBloodL) { - this.tHloseBloodL = tHloseBloodL; - } public Integer getTireNumber() { return tireNumber; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 82928a2..d12e498 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -619,6 +619,7 @@ public class PatientFacade { data.put("checkDoctor", rp.getCheckDoctor()); data.put("lName", rp.getlName()); data.put("phone", rp.getPhone()); + datas.add(data); } cnames.put("name", "姓名"); cnames.put("age", "当前年龄"); @@ -651,6 +652,7 @@ public class PatientFacade { data.put("checkDoctor", rp.getCheckDoctor()); data.put("lName", rp.getlName()); data.put("phone", rp.getPhone()); + datas.add(data); } cnames.put("name", "姓名"); cnames.put("age", "当前年龄"); @@ -680,6 +682,7 @@ public class PatientFacade { data.put("checkDoctor", rp.getCheckDoctor()); data.put("lName", rp.getlName()); data.put("phone", rp.getPhone()); + datas.add(data); } cnames.put("name", "姓名"); cnames.put("age", "分娩年龄"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java index adbe44d..fb658fb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java @@ -64,13 +64,13 @@ public class MatDeliverAddRequest implements IBasicRequestConvert