diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java index b222e8d..3eef698 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java @@ -11,9 +11,11 @@ import com.lyms.platform.pojo.AntenatalExaminationModel; import com.lyms.platform.query.AntExChuQuery; import com.lyms.platform.query.VisitQuery; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import org.springframework.util.Assert; +import java.util.Date; import java.util.List; /** @@ -31,7 +33,7 @@ public class AntenatalExaminationService { public List findAllByParentId(String parentId) { Assert.notNull(parentId, "findAllByParentId parentId must not be null."); MongoCondition condition = MongoCondition.newInstance("parentId", parentId, MongoOper.IS).and("yn", YnEnums.YES.getId(),MongoOper.IS); - return iAntenatalExaminationDao.queryAntenatalExamination(condition.toMongoQuery()); + return iAntenatalExaminationDao.queryAntenatalExamination(condition.toMongoQuery().addOrder(Sort.Direction.ASC,"created")); } @@ -76,6 +78,7 @@ public class AntenatalExaminationService { */ public AntenatalExaminationModel addOneBabyAnt(AntenatalExaminationModel babyVisitModel) { Assert.notNull(babyVisitModel, "addOneBabyAnt babyVisitModel must not be null."); + babyVisitModel.setCreated(new Date()); return iAntenatalExaminationDao.addOneAntenatalExamination(babyVisitModel); } @@ -118,6 +121,7 @@ public class AntenatalExaminationService { * @return */ public AntExChuModel addOneAntEx(AntExChuModel obj) { + obj.setCreated(new Date()); return iAntExChuDao.addOneAntEx(obj); } 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 a85f8c0..814e693 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 @@ -71,6 +71,16 @@ public class AntExChuModel implements Serializable { private String syjg; private List placentas; + private Date created; + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + public String getSyjg() { return syjg; } 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 2245e31..cf1a1e1 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 @@ -2,6 +2,7 @@ package com.lyms.platform.pojo; import org.springframework.data.mongodb.core.mapping.Document; +import java.util.Date; import java.util.List; import java.util.Map; @@ -85,6 +86,15 @@ public class AntenatalExaminationModel { //下次产检日期 private String nextCheckDate; private Integer yn; + private Date created; + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } public Integer getYn() { return yn; 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 2b74f5e..ac2dbf6 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 @@ -38,7 +38,7 @@ public class MaternalDeliverResult { //产程 h 小时 m 分 private Map prodprocess; //总产程 - private String totalprocess; + private Map totalprocess; //会阴情况 private String perinealCondition; //撕裂等级 @@ -89,8 +89,8 @@ public class MaternalDeliverResult { setDeliveryMode(JsonUtil.str2Obj(destModel.getDeliveryMode(),Map.class)); setOperationCause(destModel.getOperationCause()); - setProdprocess(JsonUtil.jkstr2Obj(destModel.getProdprocess(),Map.class)); - setTotalprocess(destModel.getTotalprocess()); + setProdprocess(JsonUtil.jkstr2Obj(destModel.getProdprocess(), Map.class)); + setTotalprocess(JsonUtil.jkstr2Obj(destModel.getTotalprocess(), Map.class)); setPerinealCondition(destModel.getPerinealCondition()); setSiLielevel(destModel.getSiLielevel()); setNeedleNum(destModel.getNeedleNum()); @@ -183,7 +183,7 @@ public class MaternalDeliverResult { public Baby(BabyModel babyModel){ setId(babyModel.getId()); - setBabyGender(SexEnum.getTextById(babyModel.getSex())); + setBabyGender(babyModel.getSex()+""); setBabyWeight(babyModel.getBabyWeight()); setBabyHeight(babyModel.getBabyHeight()); setDeformity(babyModel.getMalformation()); @@ -500,11 +500,11 @@ public class MaternalDeliverResult { this.tireNumber = tireNumber; } - public String getTotalprocess() { + public Map getTotalprocess() { return totalprocess; } - public void setTotalprocess(String totalprocess) { + public void setTotalprocess(Map totalprocess) { this.totalprocess = totalprocess; }