From 7b0396ba735273138bf942ec489e742269928de0 Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 13 Jun 2017 15:00:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/common/enums/GongJingEnums.java | 6 +- .../java/com/lyms/platform/pojo/AntExChuModel.java | 10 +++ .../platform/pojo/AntenatalExaminationModel.java | 10 +++ .../web/facade/AntenatalExaminationFacade.java | 10 ++- .../operate/web/request/AntExAddRequest.java | 17 ++-- .../operate/web/request/AntExcAddRequest.java | 23 ++--- .../operate/web/request/MatDeliverAddRequest.java | 100 +++++++++++++++++++++ 7 files changed, 153 insertions(+), 23 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/GongJingEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/GongJingEnums.java index 6ca6fc2..285c069 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/GongJingEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/GongJingEnums.java @@ -141,7 +141,7 @@ public class GongJingEnums { public enum WeiZhi { // 宫颈硬度（选择框为：软、中、硬、其他（填写）） // 4.宫颈位置（选择框为：前、中、后、其他（填写）） - Ruan("前", "前"), Zhong("中", "中"), Ying("后", "后"); + Ruan("前", "1"), Zhong("中", "2"), Ying("后", "3"),QiTa("其他","4"); WeiZhi(String name, String value) { this.name = name; @@ -170,9 +170,7 @@ public class GongJingEnums { //宫颈硬度 public enum YinDu { - // 宫颈硬度（选择框为：软、中、硬、其他（填写）） - // 4.宫颈位置（选择框为：前、中、后、其他（填写）） - Ruan("软", "软"), Zhong("中", "中"), Ying("硬", "硬"); + Ruan("软", "1"), Zhong("中", "2"), Ying("硬", "3"),QiTa("其他","4"); YinDu(String name, String value) { this.name = name; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index 8409a3c..196a352 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -75,6 +75,8 @@ public class AntExChuModel extends BaseModel { private String cestationInfo; // 宫高 private String gonggao; + // 宫高类型 + private String gonggaoType; //腹围 private String fuwei; //胎数 @@ -469,6 +471,14 @@ public class AntExChuModel extends BaseModel { this.gonggao = gonggao; } + public String getGonggaoType() { + return gonggaoType; + } + + public void setGonggaoType(String gonggaoType) { + this.gonggaoType = gonggaoType; + } + public String getHeight() { return height; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java index f0001c0..b1208cf 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java @@ -50,6 +50,8 @@ public class AntenatalExaminationModel extends BaseModel { private String bp; //宫高 private String gongGao; + //宫高类型 + private String gongGaoType; //腹围 private String abdominalCircumference; //浮肿 @@ -109,6 +111,14 @@ public class AntenatalExaminationModel extends BaseModel { //操作人 private Integer operator; + public String getGongGaoType() { + return gongGaoType; + } + + public void setGongGaoType(String gongGaoType) { + this.gongGaoType = gongGaoType; + } + public String getBloodSugar2() { return bloodSugar2; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index f732228..104fab7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -403,10 +403,7 @@ public class AntenatalExaminationFacade { return resp; } } - AntExChuModel antExChuModel = excAddRequest.convertToDataModel(); - - //表示区域的 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { String parentId = handHideBuild(excAddRequest.getPid(), excAddRequest.getParentId(), userId, 1); @@ -2148,12 +2145,19 @@ public class AntenatalExaminationFacade { map.put("getTaiPan", getTaiPan()); map.put("getTaiShu", getTaiShu()); map.put("fuzhong", getFuZhong()); + //胎膜 map.put("getTaiMo", getTm()); + //宫颈硬度 map.put("getGjyd", getGJYD()); + //宫颈位置 map.put("getGjwz", getGJWZ()); + //先露位置 map.put("getXlwz", getXLWZ()); + //阴道检测 map.put("getYdjc", getYDJC()); + //宫高 map.put("getGongGao", getGongGao()); + //横指 map.put("getHengZhi", getHengZhi()); map.put("getHighRisk", basicConfigFacade.getHighRisk()); map.put("jws", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.JIWANGSHI_ID)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index 7053fee..baf8a91 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -45,17 +45,15 @@ public class AntExAddRequest implements IBasicRequestConvert tireData; //血红蛋白 private String hemoglobin; @@ -173,6 +171,14 @@ public class AntExAddRequest implements IBasicRequestConvert { private String fujian; // 宫高 private String gonggao; + // 宫高类型 + private String gonggaoType; //腹围 private String fuwei; //胎数 private String tireNumber1; //血压 private Map bp; - - private String bg; - + //胎数 private List placentas; - /*//心率 - private double heartRate; - //胎方位 - private String fetalPosition; - //胎先露 - private String fetalPresentation; - // 衔接 - private String join;*/ //高危因素 private List highrisk ; //高危评分 @@ -255,6 +247,14 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.couponType = couponType; } + public String getGonggaoType() { + return gonggaoType; + } + + public void setGonggaoType(String gonggaoType) { + this.gonggaoType = gonggaoType; + } + public String getBarCode() { return barCode; } @@ -1005,6 +1005,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { antExChuModel.setBaricIndex(baricIndex); antExChuModel.setCestationInfo(JsonUtil.obj2JsonString(cestationInfo)); antExChuModel.setGonggao(gonggao); + antExChuModel.setGonggaoType(gonggaoType); antExChuModel.setFuwei(fuwei); antExChuModel.setTireNumber1(tireNumber1); antExChuModel.setPlacentas(placentas); 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 d5ca576..2efd2a1 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 @@ -422,6 +422,106 @@ public class MatDeliverAddRequest implements IBasicRequestConvert