From 1eea62b55dc53c2a648febc3b0afc351f8d42d82 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Mon, 10 Dec 2018 12:29:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A8=81=E6=B5=B7=E5=88=86=E5=A8=A9=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/common/enums/FmTypeEnums.java | 6 +- .../lyms/platform/pojo/MaternalDeliverModel.java | 93 ++++++++++++++++++ .../platform/operate/web/facade/ViewFacade.java | 10 ++ .../operate/web/request/MatDeliverAddRequest.java | 106 +++++++++++++++++++++ 4 files changed, 214 insertions(+), 1 deletion(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java index f680b18..a59c730 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java @@ -11,7 +11,11 @@ import java.util.Map; * Created by Administrator on 2016/6/24 0024. */ public enum FmTypeEnums { - O("顺产", "1"), O1("剖宫产", "2"); + O("顺产", "1"), + O1("剖宫产", "2"), + O2("胎吸","3"), + O3("自由体位","4"), + O4("臀牵引","5"); private FmTypeEnums(String name, String id) { this.id = id; 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 7280b10..6f7d67f 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 @@ -523,10 +523,29 @@ public class MaternalDeliverModel extends BaseModel { private String stReflex;//手头反射 private String sAbility;//吮能力 + private String umbilicus;//脐 + private String umXqFy;//脐带血清反应 + public Baby(){ } + public String getUmbilicus() { + return umbilicus; + } + + public void setUmbilicus(String umbilicus) { + this.umbilicus = umbilicus; + } + + public String getUmXqFy() { + return umXqFy; + } + + public void setUmXqFy(String umXqFy) { + this.umXqFy = umXqFy; + } + public String getDueTime() { return dueTime; } @@ -1725,6 +1744,16 @@ public class MaternalDeliverModel extends BaseModel { private String sszcjg;//手术助产经过 private String remarks;//备注 + /*******威海再次新增字段（12月计划中）*******/ + private Integer gravidity;//孕次 + private String department;//科室(1：产一；2：产二) + private List myzd;//母婴阻断 + private String analMode;//镇痛方式（1：无痛；2：无痛+陪娩；3：导乐+陪娩；4：陪娩） + private String hyCondition;//会阴情况（1：Ⅰ度；2：Ⅱ度；3：Ⅲ度；4：侧切） + private String ssRecord;//手术记录 + private List ssCount;//手术清点 + private String ssProcedure;//所施手术 + public Integer getParity() { return parity; } @@ -1836,4 +1865,68 @@ public class MaternalDeliverModel extends BaseModel { public void setRemarks(String remarks) { this.remarks = remarks; } + + public Integer getGravidity() { + return gravidity; + } + + public void setGravidity(Integer gravidity) { + this.gravidity = gravidity; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public List getMyzd() { + return myzd; + } + + public void setMyzd(List myzd) { + this.myzd = myzd; + } + + public String getAnalMode() { + return analMode; + } + + public void setAnalMode(String analMode) { + this.analMode = analMode; + } + + public String getHyCondition() { + return hyCondition; + } + + public void setHyCondition(String hyCondition) { + this.hyCondition = hyCondition; + } + + public String getSsRecord() { + return ssRecord; + } + + public void setSsRecord(String ssRecord) { + this.ssRecord = ssRecord; + } + + public List getSsCount() { + return ssCount; + } + + public void setSsCount(List ssCount) { + this.ssCount = ssCount; + } + + public String getSsProcedure() { + return ssProcedure; + } + + public void setSsProcedure(String ssProcedure) { + this.ssProcedure = ssProcedure; + } } 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 de4b404..b2791e9 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 @@ -2767,6 +2767,14 @@ public class ViewFacade { map.put("sszcjg",data.getSszcjg()); map.put("remarks",data.getRemarks()); /****************************************************/ + map.put("gravidity",data.getGravidity()); + map.put("department",data.getDepartment()); + map.put("myzd",data.getAnalMode()); + map.put("hyCondition",data.getHyCondition()); + map.put("ssRecord",data.getSsRecord()); + map.put("ssCount",data.getSsCount()); + map.put("ssProcedure",data.getSsProcedure()); + /* 产后生理 */ map.put("maternalInfo", data.getMaternalInfo() == null ? "" : CfEnums.getTitle(data.getMaternalInfo())); @@ -3044,6 +3052,8 @@ public class ViewFacade { babyMap.put("stReflex",temp.getStReflex()); babyMap.put("sAbility",temp.getsAbility()); /********************************/ + babyMap.put("umbilicus",temp.getUmbilicus()); + babyMap.put("umXqFy",temp.getUmXqFy()); babyList.add(babyMap); } 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 1eae3d4..d4c0746 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 @@ -10,6 +10,7 @@ import org.apache.commons.lang.StringUtils; import java.io.Serializable; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -212,6 +213,69 @@ public class MatDeliverAddRequest implements IBasicRequestConvert getMyzd() { + return myzd; + } + + public void setMyzd(List myzd) { + this.myzd = myzd; + } + + public String getAnalMode() { + return analMode; + } + + public void setAnalMode(String analMode) { + this.analMode = analMode; + } + + public String getHyCondition() { + return hyCondition; + } + + public void setHyCondition(String hyCondition) { + this.hyCondition = hyCondition; + } + + public String getSsRecord() { + return ssRecord; + } + + public void setSsRecord(String ssRecord) { + this.ssRecord = ssRecord; + } + + public List getSsCount() { + return ssCount; + } + + public void setSsCount(List ssCount) { + this.ssCount = ssCount; + } + + public String getSsProcedure() { + return ssProcedure; + } + + public void setSsProcedure(String ssProcedure) { + this.ssProcedure = ssProcedure; + } /******威海妇幼新增分娩记录字段******/ private Integer parity;//胎次 @@ -230,6 +294,17 @@ public class MatDeliverAddRequest implements IBasicRequestConvert myzd;//母婴阻断 + private String analMode;//镇痛方式（1：无痛；2：无痛+陪娩；3：导乐+陪娩；4：陪娩） + private String hyCondition;//会阴情况（1：Ⅰ度；2：Ⅱ度；3：Ⅲ度；4：侧切） + private String ssRecord;//手术记录 + private List ssCount;//手术清点 + private String ssProcedure;//所施手术 + + @Override public MaternalDeliverModel convertToDataModel() { MaternalDeliverModel maternalDeliverModel=new MaternalDeliverModel(); @@ -292,6 +367,16 @@ public class MatDeliverAddRequest implements IBasicRequestConvert