From 044536648fe28928bc9f022db5c84d5cdc0ec9fa Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Thu, 24 Aug 2017 20:51:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/common/enums/QuickenEnums.java | 63 ++++++++++++++++++++++ .../java/com/lyms/platform/pojo/AntExChuModel.java | 20 +++++++ .../platform/pojo/AntenatalExaminationModel.java | 20 +++++++ .../web/facade/AntenatalExaminationFacade.java | 25 +++++++-- .../platform/operate/web/facade/ViewFacade.java | 5 +- .../operate/web/request/AntExcAddRequest.java | 22 ++++++++ .../web/result/AntenatalExaminationResult.java | 20 +++++++ .../operate/web/result/AntexChuResult.java | 20 +++++++ 8 files changed, 188 insertions(+), 7 deletions(-) create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/QuickenEnums.java diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/QuickenEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/QuickenEnums.java new file mode 100644 index 0000000..4d3be9b --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/QuickenEnums.java @@ -0,0 +1,63 @@ +package com.lyms.platform.common.enums; + +import com.lyms.platform.common.utils.StringUtils; + +/** + * 胎动情况 + */ +public enum QuickenEnums { + ONE(0, "自述良好"), + TWO(1, "胎动频繁"), + THREE(2, "胎动少"), + FOUR(3, "胎动消失"), + FIVE(4, "不详"); + + private Integer id; + private String name; + + public static QuickenEnums get(Integer id) { + QuickenEnums[] values = QuickenEnums.values(); + for (QuickenEnums value : values) { + if (value.getId() == id) { + return value; + } + } + return null; + } + + public static String getName(String id) { + if(StringUtils.isEmpty(id)) { + return null; + } + int i = Integer.parseInt(id); + QuickenEnums[] values = QuickenEnums.values(); + for (QuickenEnums value : values) { + if (value.id == i) { + return value.name; + } + } + return null; + } + + QuickenEnums(Integer id, String name){ + this.id = id; + this.name = name; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + 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 ddabbf0..b0c3438 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 @@ -21,6 +21,26 @@ public class AntExChuModel extends BaseModel { /** 处理意见 */ private Map> treatmentOpinion2; private List treatmentOpinion2Types; + /** 胎动 */ + private String quicken; + /** 胎动备注 */ + private String quickenRemark; + + public String getQuicken() { + return quicken; + } + + public void setQuicken(String quicken) { + this.quicken = quicken; + } + + public String getQuickenRemark() { + return quickenRemark; + } + + public void setQuickenRemark(String quickenRemark) { + this.quickenRemark = quickenRemark; + } public List getTreatmentOpinion2Types() { return treatmentOpinion2Types; 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 0340674..9b45c2c 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 @@ -21,6 +21,26 @@ public class AntenatalExaminationModel extends BaseModel { /** 处理意见 */ private Map> treatmentOpinion2; private List treatmentOpinion2Types; + /** 胎动 */ + private String quicken; + /** 胎动备注 */ + private String quickenRemark; + + public String getQuicken() { + return quicken; + } + + public void setQuicken(String quicken) { + this.quicken = quicken; + } + + public String getQuickenRemark() { + return quickenRemark; + } + + public void setQuickenRemark(String quickenRemark) { + this.quickenRemark = quickenRemark; + } public List getTreatmentOpinion2Types() { return treatmentOpinion2Types; 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 5582ca0..1e5d5d4 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 @@ -5,10 +5,7 @@ import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.common.utils.Assert; -import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.JsonUtil; -import com.lyms.platform.common.utils.SystemConfig; +import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.InitDataUtils; @@ -24,6 +21,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; +import org.apache.tools.ant.taskdefs.Ant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -1936,6 +1934,18 @@ public class AntenatalExaminationFacade { antExChuQuery.setStart(max); //获取初诊记录 List antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery); + if (CollectionUtils.isNotEmpty(antExChulist)) { + AntExChuModel latelyAntExChuModel = null; /** 最近的一次初诊 */ + for (AntExChuModel antExChuModel : antExChulist) { + if(latelyAntExChuModel == null || antExChuModel.getCheckTime().getTime() > latelyAntExChuModel.getCheckTime().getTime()) { + latelyAntExChuModel = antExChuModel; + } + } + latelyAntExChuModel.setPregnancyTimes(latelyAntExChuModel.getPregnancyTimes()); // 孕次 + latelyAntExChuModel.setProdTime(latelyAntExChuModel.getProdTime()); // 产次 + latelyAntExChuModel.setAbortion(latelyAntExChuModel.getAbortion()); // 流产 + latelyAntExChuModel.setSurvFetus(latelyAntExChuModel.getSurvFetus()); // 存活胎儿数 + } HighScoreResult highScoreResult = findLastRisk(patients.getPid(), false); AntExQuery antExQuery = new AntExQuery(); @@ -2116,6 +2126,8 @@ public class AntenatalExaminationFacade { } antenatalExaminationResult.setTreatmentOpinion2(restTreatmentOpinion2); antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types()); + antenatalExaminationResult.setQuicken(examinationModel.getQuicken()); + antenatalExaminationResult.setQuickenRemark(examinationModel.getQuickenRemark()); antenatalExaminationResult.setIsSieve(cap(data, examinationModel.getParentId())); antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1); @@ -2178,6 +2190,8 @@ public class AntenatalExaminationFacade { } antexChuResult.setTreatmentOpinion2(restTreatmentOpinion2); antexChuResult.setTreatmentOpinion2Types(antExChuModel.getTreatmentOpinion2Types()); + antexChuResult.setQuicken(antExChuModel.getQuicken()); + antexChuResult.setQuickenRemark(antExChuModel.getQuickenRemark()); object = antexChuResult; } @@ -2314,6 +2328,9 @@ public class AntenatalExaminationFacade { public BaseResponse getEnums() { Map map = new HashMap<>(); + // 胎动情况 + map.put("quickenEnum", EnumUtil.toJson(QuickenEnums.class)); + map.put("getFetPosition", InitDataUtils.getFetPosition()); map.put("getFetal",InitDataUtils. getFetal()); map.put("getJoin", InitDataUtils.getJoin()); 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 e6d028e..f22a075 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 @@ -1770,9 +1770,6 @@ public class ViewFacade { Map map = new HashMap<>(); - map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types())); - map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2())); - /* 基本信息 */ //孕妇基本信息 map.put("id", data.getId()); @@ -1806,6 +1803,8 @@ public class ViewFacade { map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2())); map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types())); + map.put("quicken", QuickenEnums.getName(data.getQuicken())); + map.put("quickenRemark", data.getQuickenRemark()); //早孕期病毒检测 // private String zyqbdjc; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java index 16dc3b8..a042360 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java @@ -22,6 +22,26 @@ public class AntExcAddRequest implements IBasicRequestConvert { private Map> treatmentOpinion2; private List treatmentOpinion2Types; + /** 胎动 */ + private String quicken; + /** 胎动备注 */ + private String quickenRemark; + + public String getQuicken() { + return quicken; + } + + public void setQuicken(String quicken) { + this.quicken = quicken; + } + + public String getQuickenRemark() { + return quickenRemark; + } + + public void setQuickenRemark(String quickenRemark) { + this.quickenRemark = quickenRemark; + } public Map> getTreatmentOpinion2() { return treatmentOpinion2; @@ -1208,6 +1228,8 @@ public class AntExcAddRequest implements IBasicRequestConvert { antExChuModel.setTreatmentOpinion2(treatmentOpinion2); antExChuModel.setTreatmentOpinion2Types(treatmentOpinion2Types); + antExChuModel.setQuicken(quicken); + antExChuModel.setQuickenRemark(quickenRemark); antExChuModel.setAntExcAddOthers(antExcAddOthers); antExChuModel.setSurvFetus(survFetus); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java index 1bec76a..abe1a8e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java @@ -18,6 +18,26 @@ public class AntenatalExaminationResult implements IBasicResultConvert>> treatmentOpinion2; private List treatmentOpinion2Types; + /** 胎动 */ + private String quicken; + /** 胎动备注 */ + private String quickenRemark; + + public String getQuicken() { + return quicken; + } + + public void setQuicken(String quicken) { + this.quicken = quicken; + } + + public String getQuickenRemark() { + return quickenRemark; + } + + public void setQuickenRemark(String quickenRemark) { + this.quickenRemark = quickenRemark; + } public List getTreatmentOpinion2Types() { return treatmentOpinion2Types; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java index 08c4e81..828da54 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java @@ -18,6 +18,26 @@ public class AntexChuResult { /** 处理意见 */ private Map>> treatmentOpinion2; private List treatmentOpinion2Types; + /** 胎动 */ + private String quicken; + /** 胎动备注 */ + private String quickenRemark; + + public String getQuicken() { + return quicken; + } + + public void setQuicken(String quicken) { + this.quicken = quicken; + } + + public String getQuickenRemark() { + return quickenRemark; + } + + public void setQuickenRemark(String quickenRemark) { + this.quickenRemark = quickenRemark; + } public List getTreatmentOpinion2Types() { return treatmentOpinion2Types; -- 1.8.3.1