From c0b28d5fb11920e8219d0478c803e59c99dee169 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 6 Jul 2016 16:25:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=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/biz/dal/impl/SieveDaoImpl.java | 6 ++ .../lyms/platform/biz/service/PatientsService.java | 4 ++ .../lyms/platform/biz/service/SieveService.java | 1 + .../platform/common/enums/SieveStatusEnums.java | 38 +++++++++++++ .../operate/web/request/AntExcAddRequest.java | 64 ++++++++++++++++++++-- .../operate/web/result/SieveListResult.java | 30 +++++++--- 6 files changed, 130 insertions(+), 13 deletions(-) create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/SieveStatusEnums.java diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/SieveDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/SieveDaoImpl.java index cfac3b4..dd6c800 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/SieveDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/SieveDaoImpl.java @@ -13,6 +13,7 @@ import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Repository; import org.springframework.util.Assert; +import java.util.Date; import java.util.List; /** @@ -22,6 +23,7 @@ import java.util.List; public class SieveDaoImpl extends BaseMongoDAOImpl implements ISieveDao { @Override public SieveResultModel addSieveResult(SieveResultModel sieveResultModel) { + sieveResultModel.setModified(new Date()); return save(sieveResultModel); } @@ -43,6 +45,7 @@ public class SieveDaoImpl extends BaseMongoDAOImpl implements } public void updateChanQianSieve(SieveModel sieveModel) { + sieveModel.setModified(new Date()); Update update = MongoConvertHelper .convertToNativeUpdate(ReflectionUtils.getUpdateField(sieveModel)); Assert.notNull(update, "execute update method must not null."); @@ -50,7 +53,10 @@ public class SieveDaoImpl extends BaseMongoDAOImpl implements } public void addChanQianSieve(SieveModel sieveModel) { + Assert.notNull(sieveModel, "execute insert method must not null."); + sieveModel.setCreated(new Date()); + sieveModel.setModified(new Date()); mongoTemplate.insert(sieveModel); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index 162f3f4..a3626e7 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -5,6 +5,7 @@ import com.lyms.platform.biz.dal.IPatientDao; import com.lyms.platform.biz.dal.ISieveApplyOrderDao; import com.lyms.platform.biz.dal.ISieveDao; import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.enums.SieveStatusEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.LogUtil; @@ -161,7 +162,10 @@ public class PatientsService { if (CollectionUtils.isNotEmpty(list)) { sieveModel.setTireNumber(NumberUtils.toInt(list.get(0).getTireNumber())); } + sieveModel.setName(patients.getUsername()); sieveModel.setPhone(patients.getPhone()); + sieveModel.setStatus(SieveStatusEnums.O.getId()); + sieveModel.setCqStatus(0); return sieveModel; } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java index c4b7faa..9bf5780 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java @@ -35,6 +35,7 @@ public class SieveService { public void updateOneChanQianDiaSieve(SieveModel sieveModel) { sieveModel.setModified(new Date()); + sieveModel.setStatus(1); iSieveDao.updateChanQianSieve(sieveModel); } diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SieveStatusEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SieveStatusEnums.java new file mode 100644 index 0000000..9e1b89a --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SieveStatusEnums.java @@ -0,0 +1,38 @@ +package com.lyms.platform.common.enums; + +/** + * + * 产筛状态 + * + * Created by Administrator on 2016/7/6 0006. + */ +public enum SieveStatusEnums { +// 1 待产筛 2 产筛中 3 完成产筛 4 完成产诊 + O("待产筛",1), + O1("产筛中",2), + O2("完成产筛",3), + O3("完成产诊",4), + ; + private SieveStatusEnums(String name,Integer id){ + this.name=name; + this.id=id; + } + private String name; + private Integer id; + + 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-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 cbcebb0..24f040d 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 @@ -110,7 +110,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { // 其他高危 private Map otherHighRisk; // 诊断 - private String diagnosis; + private List diagnosis; //处理意见 private String treatOpinion; //指导意见 @@ -561,14 +561,70 @@ public class AntExcAddRequest implements IBasicRequestConvert { } - public String getDiagnosis() { + public String getCervical() { + return cervical; + } + + public void setCervical(String cervical) { + this.cervical = cervical; + } + + public List getDiagnosis() { return diagnosis; } - public void setDiagnosis(String diagnosis) { + public void setDiagnosis(List diagnosis) { this.diagnosis = diagnosis; } + public String getFujian() { + return fujian; + } + + public void setFujian(String fujian) { + this.fujian = fujian; + } + + public String getHeart() { + return heart; + } + + public void setHeart(String heart) { + this.heart = heart; + } + + public String getLungs() { + return lungs; + } + + public void setLungs(String lungs) { + this.lungs = lungs; + } + + public String getUterus() { + return uterus; + } + + public void setUterus(String uterus) { + this.uterus = uterus; + } + + public String getVagina() { + return vagina; + } + + public void setVagina(String vagina) { + this.vagina = vagina; + } + + public String getVulva() { + return vulva; + } + + public void setVulva(String vulva) { + this.vulva = vulva; + } + public String getDirOpinion() { return dirOpinion; } @@ -813,7 +869,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { antExChuModel.setHighrisk(JsonUtil.array2JsonString(highrisk)); antExChuModel.setHighriskSocre(highriskSocre); antExChuModel.setOtherHighRisk(JsonUtil.obj2JsonString(otherHighRisk)); - antExChuModel.setDiagnosis(diagnosis); + antExChuModel.setDiagnosis(JsonUtil.array2JsonString(diagnosis)); antExChuModel.setTreatOpinion(treatOpinion); antExChuModel.setDirOpinion(dirOpinion); antExChuModel.setProdDoctor(prodDoctor); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java index ff72c71..192bcdd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java @@ -133,17 +133,29 @@ public class SieveListResult implements IBasicResultConvert0?"+"+day+"天":""); - setTireNumber(TaiPanEnums.getTitle(destModel.getTireNumber() + "")); + if(null!=destModel.getLastMenses()){ + int days= DateUtil.daysBetween(destModel.getLastMenses(), new Date()); + String week= (days/7)+""; + int day = (days%7); + this.cDueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); + } + if(null!=destModel.getTireNumber()){ + setTireNumber(TaiPanEnums.getTitle(destModel.getTireNumber() + "")); + } setDueWeek(destModel.getDueWeek()); - setZtfx(SieveEnums.getTitle(destModel.getZtfx())); + if(null!=destModel.getZtfx()) { + setZtfx(SieveEnums.getTitle(destModel.getZtfx())); + } setPhone(destModel.getPhone()); - setCqStatus(ChanQResultEnums.getTitle(destModel.getCqStatus())); - setCqResult(ChanQResultEnums.CqResult.getTitle(destModel.getCqResult())); - setRenShenResult(RenShenJieJuEnums.getTitle(destModel.getRenShenResult())); + if(null!=destModel.getCqStatus()) { + setCqStatus(ChanQResultEnums.getTitle(destModel.getCqStatus())); + } + if(null!=destModel.getCqResult()) { + setCqResult(ChanQResultEnums.CqResult.getTitle(destModel.getCqResult())); + } + if(null!=destModel.getRenShenResult()) { + setRenShenResult(RenShenJieJuEnums.getTitle(destModel.getRenShenResult())); + } //整体风险枚举 // SieveEnums. //妊娠结局 -- 1.8.3.1