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 8d3bc85..1228abe 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 @@ -71,7 +71,7 @@ public class MaternalDeliverModel { private String loseBloodCause; //产科并发症 private String ocs; - //胎盘娩出方式 + /* //胎盘娩出方式 private String tpmcType; //娩出方式 private String mcType; @@ -84,29 +84,9 @@ public class MaternalDeliverModel { // 脐带异常 private String umbilicalCordEx; // 脐带异常类型 - private String umbilicalCordExType; - /* //新生儿性别; - private String babyGender; - //新生儿重量 - private String babyWeight; - //新生儿生长 - private String babyHeight; - //畸形 - private String deformity; - //apgar评分 - private String apgarScore; - //窒息分钟 - private String asphyxiaM; - // 妊娠结局 - private String pregnancyOut; - //新生儿疾病 - private String babyHealthy; - //母婴接触开始 - private String contactStartM; - //母婴接触时间 - private String contactM; - //早吮吸 - private String earlySuck;*/ + private String umbilicalCordExType;*/ + private List extPlacentas; + //存放新生儿表的id private List baby; //分娩医院 @@ -114,7 +94,78 @@ public class MaternalDeliverModel { //接生医生 private String deliverDoctor; private Integer yn; - + public class ExtPlacenta{ + //胎盘娩出方式 + private String tpmcType; + //娩出方式 + private String mcType; + // 胎盘大小 + private java.util.Map tpSize; + // 胎盘重量 + private String tpWeight; + //脐带长度 + private String umbilicalCordLength; + // 脐带异常 + private String umbilicalCordEx; + // 脐带异常类型 + private String umbilicalCordExType; + + public String getMcType() { + return mcType; + } + + public void setMcType(String mcType) { + this.mcType = mcType; + } + + public String getTpmcType() { + return tpmcType; + } + + public void setTpmcType(String tpmcType) { + this.tpmcType = tpmcType; + } + + public java.util.Map getTpSize() { + return tpSize; + } + + public void setTpSize(java.util.Map tpSize) { + this.tpSize = tpSize; + } + + public String getTpWeight() { + return tpWeight; + } + + public void setTpWeight(String tpWeight) { + this.tpWeight = tpWeight; + } + + public String getUmbilicalCordEx() { + return umbilicalCordEx; + } + + public void setUmbilicalCordEx(String umbilicalCordEx) { + this.umbilicalCordEx = umbilicalCordEx; + } + + public String getUmbilicalCordExType() { + return umbilicalCordExType; + } + + public void setUmbilicalCordExType(String umbilicalCordExType) { + this.umbilicalCordExType = umbilicalCordExType; + } + + public String getUmbilicalCordLength() { + return umbilicalCordLength; + } + + public void setUmbilicalCordLength(String umbilicalCordLength) { + this.umbilicalCordLength = umbilicalCordLength; + } + } public Integer getYn() { return yn; } @@ -227,13 +278,7 @@ public class MaternalDeliverModel { this.maternalInfo = maternalInfo; } - public String getMcType() { - return mcType; - } - public void setMcType(String mcType) { - this.mcType = mcType; - } public Integer getNeedleNum() { return needleNum; @@ -363,51 +408,11 @@ public class MaternalDeliverModel { this.totalprocess = totalprocess; } - public String getTpmcType() { - return tpmcType; - } - - public void setTpmcType(String tpmcType) { - this.tpmcType = tpmcType; - } - - public String getTpSize() { - return tpSize; - } - - public void setTpSize(String tpSize) { - this.tpSize = tpSize; - } - - public String getTpWeight() { - return tpWeight; - } - - public void setTpWeight(String tpWeight) { - this.tpWeight = tpWeight; - } - - public String getUmbilicalCordEx() { - return umbilicalCordEx; - } - - public void setUmbilicalCordEx(String umbilicalCordEx) { - this.umbilicalCordEx = umbilicalCordEx; - } - - public String getUmbilicalCordExType() { - return umbilicalCordExType; - } - - public void setUmbilicalCordExType(String umbilicalCordExType) { - this.umbilicalCordExType = umbilicalCordExType; - } - - public String getUmbilicalCordLength() { - return umbilicalCordLength; + public List getExtPlacentas() { + return extPlacentas; } - public void setUmbilicalCordLength(String umbilicalCordLength) { - this.umbilicalCordLength = umbilicalCordLength; + public void setExtPlacentas(List extPlacentas) { + this.extPlacentas = extPlacentas; } } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java index 68d01f1..c71cb47 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java @@ -2,6 +2,8 @@ package com.lyms.platform.pojo; import org.springframework.data.mongodb.core.mapping.Document; +import java.util.Date; + /** * 转诊申请单 *

@@ -27,6 +29,26 @@ public class ReferralApplyOrderModel { private String transferMode; //申请医生 private String applyDoctor; + //创建时间 + private Date created; + //申请单状态 0 已接收 1 已转出 2 建议转诊 + private Integer status; + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } public String getApplyDoctor() { return applyDoctor; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java index 5fb32fc..5cafdd7 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java @@ -2,6 +2,8 @@ package com.lyms.platform.pojo; import org.springframework.data.mongodb.core.mapping.Document; +import java.util.Date; + /** * 产筛申请单 *

@@ -21,6 +23,17 @@ public class SieveApplyOrderModel { //申请医生 private String applyDoctor; + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + //创建时间 + private Date created; + public String getApplyDoctor() { return applyDoctor; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 9516b1c..46ba034 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -13,6 +13,7 @@ import com.lyms.platform.query.SieveApplyOrderQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.Date; import java.util.List; /** @@ -30,7 +31,10 @@ public class ApplyOrderFacade { * @return */ public BaseResponse addOneReferralApplyOrder(ReferralApplyOrderAddRequest referralApplyOrderAddRequest) { - applyOrderService.addOneReferralApplyOrder(referralApplyOrderAddRequest.convertToDataModel()); + ReferralApplyOrderModel referralApplyOrderModel = referralApplyOrderAddRequest.convertToDataModel(); + referralApplyOrderModel.setCreated(new Date()); + referralApplyOrderModel.setStatus(0); + applyOrderService.addOneReferralApplyOrder(referralApplyOrderModel); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -41,7 +45,9 @@ public class ApplyOrderFacade { * @return */ public BaseResponse addOneSieveApplyOrder(SieveApplyOrderAddRequest sieveApplyOrderAddRequest) { - applyOrderService.addOneSieveApplyOrder(sieveApplyOrderAddRequest.convertToDataModel()); + SieveApplyOrderModel sieveApplyOrderModel = sieveApplyOrderAddRequest.convertToDataModel(); + sieveApplyOrderModel.setCreated(new Date()); + applyOrderService.addOneSieveApplyOrder(sieveApplyOrderModel); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } 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 1549d8b..725c7c8 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 @@ -12,6 +12,7 @@ import com.lyms.platform.pojo.MaternalDeliverModel; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; /** * Created by Administrator on 2016/6/17 0017. @@ -31,18 +32,20 @@ public class MatDeliverAddRequest implements IBasicRequestConvert placentas; + //胎盘及新生儿 + private List extPlacentas; //分娩方式 - private String deliveryMode; + private Map deliveryMode; //手术原因 private String operationCause; //产程 h 小时 m 分 - private String prodprocess; + private Map prodprocess; //总产程 - private String totalprocess; + private Map totalprocess; //会阴情况 private String perinealCondition; //撕裂等级 - private int siLielevel; + private Integer siLielevel; //锋线针数 private Integer needleNum; //产妇情况 @@ -50,9 +53,9 @@ public class MatDeliverAddRequest implements IBasicRequestConvert babies; //分娩医院 private String fmHospital; //接生医生 private String deliverDoctor; + + public List getExtPlacentas() { + return extPlacentas; + } + + public void setExtPlacentas(List extPlacentas) { + this.extPlacentas = extPlacentas; + } + @Override public MaternalDeliverModel convertToDataModel() { MaternalDeliverModel maternalDeliverModel=new MaternalDeliverModel(); @@ -98,17 +97,17 @@ public class MatDeliverAddRequest implements IBasicRequestConvert{ private String id; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java index b914a93..3f7bcf1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java @@ -1,13 +1,12 @@ package com.lyms.platform.operate.web.result; -import com.lyms.platform.common.base.IBasicResultConvert; import com.lyms.platform.common.enums.SexEnum; -import com.lyms.platform.pojo.AntenatalExaminationModel; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.MaternalDeliverModel; -import com.lyms.platform.pojo.Patients; import java.util.List; +import java.util.Map; /** * 产妇分娩 @@ -30,11 +29,11 @@ public class MaternalDeliverResult { //胎盘信息 private List placentas; //分娩方式 - private String deliveryMode; + private Map deliveryMode; //手术原因 private String operationCause; //产程 h 小时 m 分 - private String prodprocess; + private Map prodprocess; //总产程 private String totalprocess; //会阴情况 @@ -48,9 +47,9 @@ public class MaternalDeliverResult { //死亡原因 private String deathCause; //产后血压 - private String chBp; + private Map chBp; //产后2小时血压 - private String ch2Bp; + private Map ch2Bp; //呼吸 private String breath; // 脉搏 @@ -66,21 +65,8 @@ public class MaternalDeliverResult { //失血原因 private String loseBloodCause; //产科并发症 - private String ocs; - //胎盘娩出方式 - private String tpmcType; - //娩出方式 - private String mcType; - // 胎盘大小 - private String tpSize; - // 胎盘重量 - private String tpWeight; - //脐带长度 - private String umbilicalCordLength; - // 脐带异常 - private String umbilicalCordEx; - // 脐带异常类型 - private String umbilicalCordExType; + private Map ocs; + private List extPlacentas; private List babies; //分娩医院 @@ -97,18 +83,18 @@ public class MaternalDeliverResult { setTireNumber(destModel.getTireNumber()); setPlacenta(destModel.getPlacenta()); setPlacentas(destModel.getPlacentas()); - setDeliveryMode(destModel.getDeliveryMode()); + setDeliveryMode(JsonUtil.str2Obj(destModel.getDeliveryMode(),Map.class)); setOperationCause(destModel.getOperationCause()); - setProdprocess(destModel.getProdprocess()); + setProdprocess(JsonUtil.str2Obj(destModel.getProdprocess(),Map.class)); setTotalprocess(destModel.getTotalprocess()); setPerinealCondition(destModel.getPerinealCondition()); setSiLielevel(destModel.getSiLielevel()); setNeedleNum(destModel.getNeedleNum()); setMaternalInfo(destModel.getMaternalInfo()); setDeathCause(destModel.getDeathCause()); - setChBp(destModel.getChBp()); - setCh2Bp(destModel.getCh2Bp()); + setChBp(JsonUtil.str2Obj(destModel.getChBp(),Map.class)); + setCh2Bp(JsonUtil.str2Obj(destModel.getCh2Bp(),Map.class)); setBreath(destModel.getBreath()); setPulse(destModel.getPulse()); setoHloseBloodL(destModel.getoHloseBloodL()); @@ -116,14 +102,8 @@ public class MaternalDeliverResult { setrHloseBloodL(destModel.getrHloseBloodL()); setsHloseBloodL(destModel.getsHloseBloodL()); setLoseBloodCause(destModel.getLoseBloodCause()); - setOcs(destModel.getOcs()); - setTpmcType(destModel.getTpmcType()); - setMcType(destModel.getMcType()); - setTpSize(destModel.getTpSize()); - setTpWeight(destModel.getTpWeight()); - setUmbilicalCordLength(destModel.getUmbilicalCordLength()); - setUmbilicalCordEx(destModel.getUmbilicalCordEx()); - setUmbilicalCordExType(destModel.getUmbilicalCordExType()); + setOcs(JsonUtil.str2Obj(destModel.getOcs(),Map.class)); + setExtPlacentas(destModel.getExtPlacentas()); setFmHospital(destModel.getFmHospital()); setDeliverDoctor(destModel.getDeliverDoctor()); @@ -327,21 +307,7 @@ public class MaternalDeliverResult { this.breath = breath; } - public String getCh2Bp() { - return ch2Bp; - } - public void setCh2Bp(String ch2Bp) { - this.ch2Bp = ch2Bp; - } - - public String getChBp() { - return chBp; - } - - public void setChBp(String chBp) { - this.chBp = chBp; - } public String getDeathCause() { return deathCause; @@ -359,13 +325,7 @@ public class MaternalDeliverResult { this.deliverDoctor = deliverDoctor; } - public String getDeliveryMode() { - return deliveryMode; - } - public void setDeliveryMode(String deliveryMode) { - this.deliveryMode = deliveryMode; - } public String getDueDate() { return dueDate; @@ -415,13 +375,7 @@ public class MaternalDeliverResult { this.maternalInfo = maternalInfo; } - public String getMcType() { - return mcType; - } - public void setMcType(String mcType) { - this.mcType = mcType; - } public Integer getNeedleNum() { return needleNum; @@ -431,13 +385,7 @@ public class MaternalDeliverResult { this.needleNum = needleNum; } - public String getOcs() { - return ocs; - } - public void setOcs(String ocs) { - this.ocs = ocs; - } public String getoHloseBloodL() { return oHloseBloodL; @@ -487,13 +435,7 @@ public class MaternalDeliverResult { this.placentas = placentas; } - public String getProdprocess() { - return prodprocess; - } - public void setProdprocess(String prodprocess) { - this.prodprocess = prodprocess; - } public String getPulse() { return pulse; @@ -551,51 +493,51 @@ public class MaternalDeliverResult { this.totalprocess = totalprocess; } - public String getTpmcType() { - return tpmcType; + public Map getCh2Bp() { + return ch2Bp; } - public void setTpmcType(String tpmcType) { - this.tpmcType = tpmcType; + public void setCh2Bp(Map ch2Bp) { + this.ch2Bp = ch2Bp; } - public String getTpSize() { - return tpSize; + public Map getChBp() { + return chBp; } - public void setTpSize(String tpSize) { - this.tpSize = tpSize; + public void setChBp(Map chBp) { + this.chBp = chBp; } - public String getTpWeight() { - return tpWeight; + public Map getDeliveryMode() { + return deliveryMode; } - public void setTpWeight(String tpWeight) { - this.tpWeight = tpWeight; + public void setDeliveryMode(Map deliveryMode) { + this.deliveryMode = deliveryMode; } - public String getUmbilicalCordEx() { - return umbilicalCordEx; + public List getExtPlacentas() { + return extPlacentas; } - public void setUmbilicalCordEx(String umbilicalCordEx) { - this.umbilicalCordEx = umbilicalCordEx; + public void setExtPlacentas(List extPlacentas) { + this.extPlacentas = extPlacentas; } - public String getUmbilicalCordExType() { - return umbilicalCordExType; + public Map getOcs() { + return ocs; } - public void setUmbilicalCordExType(String umbilicalCordExType) { - this.umbilicalCordExType = umbilicalCordExType; + public void setOcs(Map ocs) { + this.ocs = ocs; } - public String getUmbilicalCordLength() { - return umbilicalCordLength; + public Map getProdprocess() { + return prodprocess; } - public void setUmbilicalCordLength(String umbilicalCordLength) { - this.umbilicalCordLength = umbilicalCordLength; + public void setProdprocess(Map prodprocess) { + this.prodprocess = prodprocess; } }