From 7bdb7e298fb3bf42c8f448dfac603eabbff0215e Mon Sep 17 00:00:00 2001 From: yangfei Date: Wed, 25 Jul 2018 14:29:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E7=BB=8F=E5=81=9C=E7=95=99=E5=91=A8?= =?UTF-8?q?=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/pojo/Patients.java | 24 ++++++++++++++++++++++ .../job/index/restore/data/ConvertHelper.java | 16 ++++++++++++++- .../web/facade/AntenatalExaminationFacade.java | 23 +++++++++++++++------ .../operate/web/facade/BookbuildingFacade.java | 7 +++++++ .../operate/web/facade/PatientServiceFacade.java | 2 ++ .../platform/operate/web/facade/ViewFacade.java | 3 +++ .../web/request/YunBookbuildingAddRequest.java | 22 ++++++++++++++++++++ .../operate/web/result/AntexChuResult.java | 10 +++++++++ .../operate/web/result/AntexListResult.java | 24 ++++++++++++++++++++++ .../operate/web/result/PregnantInfoResult.java | 22 ++++++++++++++++++++ 10 files changed, 146 insertions(+), 7 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 415587e..b246e71 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -42,6 +42,14 @@ public class Patients extends BaseModel { // 月经周期开始天数 private String mensEndDay; + + // 月经停留开始天数 + private String mensStopStartDay; + + // 月经停留开始天数 + private String mensStopEndDay; + + // 初诊复诊发送推送消息时间 private Date sendMsgTime; /** @@ -316,6 +324,22 @@ public class Patients extends BaseModel { this.mensStartDay = mensStartDay; } + public String getMensStopStartDay() { + return mensStopStartDay; + } + + public void setMensStopStartDay(String mensStopStartDay) { + this.mensStopStartDay = mensStopStartDay; + } + + public String getMensStopEndDay() { + return mensStopEndDay; + } + + public void setMensStopEndDay(String mensStopEndDay) { + this.mensStopEndDay = mensStopEndDay; + } + public String getSendCareMan() { return sendCareMan; } diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java index ce82357..cdb1631 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java @@ -696,7 +696,7 @@ public class ConvertHelper { JSONObject antChuJson = new JSONObject(); //月经周期 String mensDay = ""; - if (patients.getMensEndDay() != null) { + if (patients.getMensStartDay() != null) { mensDay = StringUtils.unitHandle(patients.getMensStartDay(), UnitConstants.DAY); } @@ -706,6 +706,20 @@ public class ConvertHelper { } mensDay += StringUtils.unitHandle(patients.getMensEndDay(), UnitConstants.DAY); } + + //月经周期 + String mensStopDay = ""; + if (patients.getMensStopStartDay() != null) { + mensStopDay = StringUtils.unitHandle(patients.getMensStopStartDay(), UnitConstants.DAY); + } + + if (patients.getMensStopEndDay() != null) { + if (StringUtils.isNotEmpty(mensStopDay)) { + mensStopDay += " - "; + } + mensStopDay += StringUtils.unitHandle(patients.getMensStopEndDay(), UnitConstants.DAY); + } + antChuJson.put("mensDay", mensDay); //诊断时间 antChuJson.put("checkTime", DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime())); 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 25b225e..ba85293 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 @@ -14,7 +14,6 @@ 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.service.ITrackDownService; -import com.lyms.platform.operate.web.utils.FunvCommonUtil; import com.lyms.platform.operate.web.utils.InitDataUtils; import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.operate.web.utils.ResolveUtils; @@ -33,9 +32,6 @@ import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; -import org.dom4j.Document; -import org.dom4j.DocumentHelper; -import org.dom4j.Element; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -48,7 +44,6 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; import org.springframework.util.StopWatch; -import java.io.UnsupportedEncodingException; import java.util.*; import java.util.regex.Pattern; @@ -2898,7 +2893,7 @@ public class AntenatalExaminationFacade { if (patients != null) { //月经周期 String mensDay = ""; - if (patients.getMensEndDay() != null) { + if (patients.getMensStartDay() != null) { mensDay = patients.getMensStartDay(); } @@ -2909,6 +2904,22 @@ public class AntenatalExaminationFacade { mensDay += patients.getMensEndDay(); } antexChuResult.setMensDay(mensDay); + + //月经周期 + String mensStopDay = ""; + if (patients.getMensStopStartDay() != null) { + mensStopDay = patients.getMensStopStartDay(); + } + + if (patients.getMensStopEndDay() != null) { + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(mensStopDay)) { + mensStopDay += " - "; + } + mensStopDay += patients.getMensStopEndDay(); + } + antexChuResult.setMensStopDay(mensStopDay); + + antexChuResult.setVcCardNo(patients.getVcCardNo()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 4e06028..52fdf38 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1180,6 +1180,10 @@ public class BookbuildingFacade { patient.setMensEndDay(yunRequest.getMensEndDay()); + patient.setMensStopStartDay(yunRequest.getMensStopStartDay()); + + patient.setMensStopEndDay(yunRequest.getMensStopEndDay()); + patient.setUsername(yunRequest.getPregnantName()); patient.setPcerteTypeId(yunRequest.getPregnantCertificateTypeId()); @@ -1374,6 +1378,9 @@ public class BookbuildingFacade { result.setMensStartDay(p.getMensStartDay()); result.setMensEndDay(p.getMensEndDay()); + result.setMensStopStartDay(p.getMensStopStartDay()); + result.setMensStopEndDay(p.getMensStopEndDay()); + /** 是否发放过优惠券 */ result.setSendCoupon(p.isSendCoupon() == null ? false : p.isSendCoupon()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 2f53fa5..760d70e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -752,6 +752,8 @@ public class PatientServiceFacade { jsonObject.put("perType", ps.getPerType()); //指定医生 jsonObject.put("serDoct", ps.getSerDoct() == null ? "" : ps.getSerDoct()); + //开通医生 + jsonObject.put("createUser", ps.getCreateUser() == null ? "" : ps.getCreateUser()); //服务状态 jsonObject.put("serStatus", ps.getSerStatus()); jsonObject.put("hospitalId", ps.getHospitalId()); 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 66c22d0..faa63be 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 @@ -172,6 +172,9 @@ public class ViewFacade { map.put("mensStartDay", data.getMensStartDay()); map.put("mensEndDay", data.getMensEndDay()); + map.put("mensStopStartDay", data.getMensStopStartDay()); + map.put("mensStopEndDay", data.getMensStopEndDay()); + map.put("id", data.getId()); /* 孕妇基础数据 */ map.put("username", data.getUsername()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index 7563624..750fb66 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -158,6 +158,28 @@ public class YunBookbuildingAddRequest { // 月经周期开始天数 private String mensEndDay; + // 月经停留开始天数 + private String mensStopStartDay; + + // 月经停留开始天数 + private String mensStopEndDay; + + public String getMensStopStartDay() { + return mensStopStartDay; + } + + public void setMensStopStartDay(String mensStopStartDay) { + this.mensStopStartDay = mensStopStartDay; + } + + public String getMensStopEndDay() { + return mensStopEndDay; + } + + public void setMensStopEndDay(String mensStopEndDay) { + this.mensStopEndDay = mensStopEndDay; + } + public List> getSerInfos() { return serInfos; } 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 ead53e3..5151f7d 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 @@ -186,6 +186,8 @@ public class AntexChuResult { private String bg; // 月经周期开始天数 private String mensDay; + // 月经周期开始天数 + private String mensStopDay; /** * 初检信息 @@ -514,6 +516,14 @@ public class AntexChuResult { this.thyStim = thyStim; } + public String getMensStopDay() { + return mensStopDay; + } + + public void setMensStopDay(String mensStopDay) { + this.mensStopDay = mensStopDay; + } + public String getAntGlan() { return antGlan; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java index e255232..38465f8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java @@ -332,6 +332,8 @@ public class AntexListResult { } setMensEndDay(patients.getMensEndDay()); setMensStartDay(patients.getMensStartDay()); + setMensStopEndDay(patients.getMensStopEndDay()); + setMensStopStartDay(patients.getMensStopStartDay()); setFuckLastMens(DateUtil.getyyyy_MM_dd(patients.getFuckLastMens())); } return this; @@ -343,6 +345,28 @@ public class AntexListResult { private String mensStartDay; private String mensEndDay; + /** + * 月经周期 + */ + private String mensStopStartDay; + private String mensStopEndDay; + + public String getMensStopStartDay() { + return mensStopStartDay; + } + + public void setMensStopStartDay(String mensStopStartDay) { + this.mensStopStartDay = mensStopStartDay; + } + + public String getMensStopEndDay() { + return mensStopEndDay; + } + + public void setMensStopEndDay(String mensStopEndDay) { + this.mensStopEndDay = mensStopEndDay; + } + private String fuckLastMens; public String getFuckLastMens() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java index 8773eea..9d10e94 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java @@ -138,6 +138,28 @@ public class PregnantInfoResult { // 月经周期开始天数 private String mensEndDay; + // 月经停留开始天数 + private String mensStopStartDay; + + // 月经停留开始天数 + private String mensStopEndDay; + + public String getMensStopStartDay() { + return mensStopStartDay; + } + + public void setMensStopStartDay(String mensStopStartDay) { + this.mensStopStartDay = mensStopStartDay; + } + + public String getMensStopEndDay() { + return mensStopEndDay; + } + + public void setMensStopEndDay(String mensStopEndDay) { + this.mensStopEndDay = mensStopEndDay; + } + public String getMensEndDay() { return mensEndDay; } -- 1.8.3.1