diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/QiDaiEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/QiDaiEnums.java
new file mode 100644
index 0000000..0415e96
--- /dev/null
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/QiDaiEnums.java
@@ -0,0 +1,34 @@
+package com.lyms.platform.common.enums;
+
+/**
+ * 脐带异常类型
+ *
+ * Created by Administrator on 2016/6/24 0024.
+ */
+public enum QiDaiEnums {
+ O1("脐带缠绕", "0");
+
+ private QiDaiEnums(String name, String id) {
+ this.name = name;
+ this.id = id;
+ }
+
+ private String name;
+ private String id;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/TaiPanEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/TaiPanEnums.java
index 33c76ed..ef3e4f2 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/TaiPanEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/TaiPanEnums.java
@@ -12,6 +12,31 @@ public enum TaiPanEnums {
O4("五胎","5"),
O5("六胎","6"),
O6("七胎","7");
+ public enum TpEnums {
+ O("完整","1"),O1("不完整","2");
+ private TpEnums(String name,String id){
+ this.name=name;
+ this.id=id;
+ }
+ private String name;
+ private String id;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+ }
private TaiPanEnums(String name,String id){
this.name=name;
this.id=id;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index 6a3f84f..78fa9ea 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -182,7 +182,7 @@ public class MatDeliverFacade {
}
public BaseResponse getEnums() {
- Map map =new HashMap<>();
+ Map map = new HashMap<>();
map.put("getFmType", getFmType());
map.put("getCfType", getCfType());
map.put("getFmScEnums", getFmScEnums());
@@ -192,106 +192,150 @@ public class MatDeliverFacade {
map.put("getTpmcTypeEnums", getTpmcTypeEnums());
map.put("getFetPosition", getFetPosition());
map.put("getFetal", getFetal());
+ map.put("getTaiShu", getTaiShu());
+ map.put("getTaiPan", getTaiPan());
+ map.put("getQidaiYc", getQidaiYc());
return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
}
//胎方位
- public List