From c4e1cfd53a142e7543b743524173867f93804120 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Sat, 30 Jul 2016 16:25:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E4=B8=80=E4=B8=AA=E5=AD=95=E5=A6=87?= =?UTF-8?q?=E5=9C=A8=E5=90=8C=E4=B8=80=E5=8C=BB=E9=99=A2=E7=9A=84=E6=9C=AC?= =?UTF-8?q?=E6=AC=A1=E5=A6=8A=E5=A8=A0=E6=9C=9F=E4=B8=AD=EF=BC=8C=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E6=9C=89=E4=B8=80=E6=AC=A1=E5=88=9D=E8=AF=8A=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=B9=B6=E4=B8=94=E5=9C=A8=E6=9C=AC=E9=99=A2=E7=9A=84?= =?UTF-8?q?=E5=90=8C=E4=B8=80=E5=A4=A9=E5=86=85=E4=B8=8D=E8=83=BD=E5=A4=9A?= =?UTF-8?q?=E6=AC=A1=E5=A4=8D=E8=AF=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/query/AntExChuQuery.java | 14 ++++++++++-- .../web/facade/AntenatalExaminationFacade.java | 25 ++++++++++++++++++++++ .../operate/web/request/AntExAddRequest.java | 3 ++- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java index 4284f02..55f3ca4 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java @@ -18,13 +18,21 @@ public class AntExChuQuery extends BaseQuery implements IConvertToNativeQuery { private String id; //创建时间 private Date start; - + private String hospitalId; private Date end; private Date nextCheckTime; private Date nextCheckTimeStart; private Date nextCheckTimeEnd; + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + public Date getNextCheckTime() { return nextCheckTime; } @@ -89,7 +97,9 @@ public class AntExChuQuery extends BaseQuery implements IConvertToNativeQuery { condition= condition.and("nextCheckTime",nextCheckTime, MongoOper.IS); } - + if(null!=hospitalId){ + condition=condition.and("hospitalId",hospitalId,MongoOper.IS); + } boolean isAddStart = Boolean.FALSE; Criteria c = null; 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 a8a11d8..318e57d 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 @@ -51,6 +51,7 @@ public class AntenatalExaminationFacade { @Autowired private StopPregnancyService stopPregnancyService; + /** * 增加一条产前检查 * @@ -70,6 +71,14 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(list1)) { model.setHospitalId(list1.get(0) + ""); } + AntExQuery antExQuery=new AntExQuery(); + antExQuery.setYn(YnEnums.YES.getId()); + antExQuery.setParentId(antExAddRequest.getParentId()); + antExQuery.setStart(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date()))); + List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); + if(CollectionUtils.isNotEmpty(list)){ + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("同一天只能建一次复诊"); + } antenatalExaminationService.addOneBabyAnt(model); updateApplyOrder(model, antExAddRequest.getParentId()); } @@ -107,6 +116,22 @@ public class AntenatalExaminationFacade { List list1 = autoMatchFacade.matchOrgId(userId); if (CollectionUtils.isNotEmpty(list1)) { antExChuModel.setHospitalId(list1.get(0) + ""); + AntExChuQuery antExChuQuery=new AntExChuQuery(); + antExChuQuery.setYn(YnEnums.YES.getId()); + antExChuQuery.setHospitalId(list1.get(0) + ""); + + Patients patients = patientsService.findOnePatientById(excAddRequest.getParentId()); + PatientsQuery patientsQuery=new PatientsQuery(); + patientsQuery.setPid(patients.getPid()); + patientsQuery.setYn(YnEnums.YES.getId()); + + List list = patientsService.queryPatient(patientsQuery); + antExChuQuery.setStart(list.get(0).getCreated()); + + List data = antenatalExaminationService.queryAntExChu(antExChuQuery); + if(CollectionUtils.isNotEmpty(data)){ + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("您本次妊娠中已在本医院建档"); + } } antExChuModel.setYn(YnEnums.YES.getId()); antenatalExaminationService.addOneAntEx(antExChuModel); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index 6fc3116..72ae27c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -6,6 +6,7 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.AntenatalExaminationModel; import org.codehaus.jackson.annotate.JsonIgnore; +import org.hibernate.validator.constraints.NotEmpty; import java.util.List; import java.util.Map; @@ -130,7 +131,7 @@ public class AntExAddRequest implements IBasicRequestConvert