From 959bde012dfe1070546e6ade42ce27ed5d01ff07 Mon Sep 17 00:00:00 2001 From: yangfei Date: Sat, 9 Jun 2018 11:53:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E6=8E=A8=E9=80=81=E6=8F=90?= =?UTF-8?q?=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/AntenatalExaminationFacade.java | 13 ++ .../operate/web/request/AntExcAddRequest.java | 250 +++++++++++---------- 2 files changed, 142 insertions(+), 121 deletions(-) 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 0143478..f81a2b4 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 @@ -343,6 +343,7 @@ public class AntenatalExaminationFacade { commonThreadPool.execute(new Runnable() { @Override public void run() { + Patients patients = patientsService.findOnePatientById(antExamModel.getParentId()); try { //更新主档案或者子档案下次预约时间冗余到patient表的数据 patientsService.updateNextCheckTime(DateUtil.getyyyy_MM_dd(antExamModel.getNextCheckTime()), antExamModel.getParentId()); @@ -391,8 +392,14 @@ public class AntenatalExaminationFacade { } catch (Exception e) { e.printStackTrace(); } + try{ + createSendMsg(patients); + }catch (Exception e){ + e.printStackTrace(); + } } }); + } @@ -822,6 +829,12 @@ public class AntenatalExaminationFacade { } catch (Exception e) { e.printStackTrace(); } + + try{ + createSendMsg(patients); + }catch (Exception e){ + e.printStackTrace(); + } } }); } 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 e554200..ae0fc05 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 @@ -27,41 +27,11 @@ public class AntExcAddRequest implements IBasicRequestConvert { private Integer first; // 1否 2 是，是否当前医院第一次初诊 德州需求 + private int isSend; // 是否发送推送，1是 + //该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项 private String lisCheckItems; - public Integer getFirst() { - return first; - } - - public void setFirst(Integer first) { - this.first = first; - } - - public String getLisCheckItems() { - return lisCheckItems; - } - - public void setLisCheckItems(String lisCheckItems) { - this.lisCheckItems = lisCheckItems; - } - - public String getGenRemark() { - return genRemark; - } - - public void setGenRemark(String genRemark) { - this.genRemark = genRemark; - } - - public String getGynRemark() { - return gynRemark; - } - - public void setGynRemark(String gynRemark) { - this.gynRemark = gynRemark; - } - List mHighRiskReason; private String cweight; @@ -76,54 +46,6 @@ public class AntExcAddRequest implements IBasicRequestConvert { private String yqweight; - public String getYqweight() { - return yqweight; - } - - public void setYqweight(String yqweight) { - this.yqweight = yqweight; - } - - public String getHbp() { - return hbp; - } - - public void setHbp(String hbp) { - this.hbp = hbp; - } - - public String getLbp() { - return lbp; - } - - public void setLbp(String lbp) { - this.lbp = lbp; - } - - public String getFeritin() { - return feritin; - } - - public void setFeritin(String feritin) { - this.feritin = feritin; - } - - public String getDiabetes() { - return diabetes; - } - - public void setDiabetes(String diabetes) { - this.diabetes = diabetes; - } - - public List getmHighRiskReason() { - return mHighRiskReason; - } - - public void setmHighRiskReason(List mHighRiskReason) { - this.mHighRiskReason = mHighRiskReason; - } - private Map> treatmentOpinion2; private List treatmentOpinion2Types; /** @@ -135,47 +57,6 @@ public class AntExcAddRequest implements IBasicRequestConvert { */ private String quickenRemark; - public String getCweight() { - return cweight; - } - - public void setCweight(String cweight) { - this.cweight = cweight; - } - - 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; - } - - public void setTreatmentOpinion2(Map> treatmentOpinion2) { - this.treatmentOpinion2 = treatmentOpinion2; - } - - public List getTreatmentOpinion2Types() { - return treatmentOpinion2Types; - } - - public void setTreatmentOpinion2Types(List treatmentOpinion2Types) { - this.treatmentOpinion2Types = treatmentOpinion2Types; - } - - @FormParam @NotEmpty(message = "孕妇id不能为空") private String parentId; @@ -462,6 +343,133 @@ public class AntExcAddRequest implements IBasicRequestConvert { //浮肿 private String edema; + + public Integer getFirst() { + return first; + } + + public void setFirst(Integer first) { + this.first = first; + } + + public String getLisCheckItems() { + return lisCheckItems; + } + + public void setLisCheckItems(String lisCheckItems) { + this.lisCheckItems = lisCheckItems; + } + + public String getGenRemark() { + return genRemark; + } + + public void setGenRemark(String genRemark) { + this.genRemark = genRemark; + } + + public String getGynRemark() { + return gynRemark; + } + + public void setGynRemark(String gynRemark) { + this.gynRemark = gynRemark; + } + public String getYqweight() { + return yqweight; + } + + public void setYqweight(String yqweight) { + this.yqweight = yqweight; + } + + public String getHbp() { + return hbp; + } + + public void setHbp(String hbp) { + this.hbp = hbp; + } + + public String getLbp() { + return lbp; + } + + public void setLbp(String lbp) { + this.lbp = lbp; + } + + public String getFeritin() { + return feritin; + } + + public void setFeritin(String feritin) { + this.feritin = feritin; + } + + public String getDiabetes() { + return diabetes; + } + + public void setDiabetes(String diabetes) { + this.diabetes = diabetes; + } + + public List getmHighRiskReason() { + return mHighRiskReason; + } + + public void setmHighRiskReason(List mHighRiskReason) { + this.mHighRiskReason = mHighRiskReason; + } + public String getCweight() { + return cweight; + } + + public void setCweight(String cweight) { + this.cweight = cweight; + } + + 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; + } + + public void setTreatmentOpinion2(Map> treatmentOpinion2) { + this.treatmentOpinion2 = treatmentOpinion2; + } + + public List getTreatmentOpinion2Types() { + return treatmentOpinion2Types; + } + + public void setTreatmentOpinion2Types(List treatmentOpinion2Types) { + this.treatmentOpinion2Types = treatmentOpinion2Types; + } + + public int getIsSend() { + return isSend; + } + + public void setIsSend(int isSend) { + this.isSend = isSend; + } + public List getScreenResult() { return screenResult; } -- 1.8.3.1