From 71ef7bdb56abdf99b029660a3e085e65d437d550 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 6 Jan 2017 11:32:14 +0800 Subject: [PATCH] 1 --- .../platform/query/PatientCheckTicketQuery.java | 13 +++++++++ .../web/facade/AntenatalExaminationFacade.java | 33 +++++++++++++++++----- 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientCheckTicketQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientCheckTicketQuery.java index 8b12559..2747f30 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientCheckTicketQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientCheckTicketQuery.java @@ -14,6 +14,16 @@ import org.springframework.data.mongodb.core.query.Criteria; public class PatientCheckTicketQuery extends BaseQuery implements IConvertToNativeQuery { private String id; + private String pid; + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + private String patientId; private String hospitalId; private String consumeHospitalId; @@ -28,6 +38,9 @@ public class PatientCheckTicketQuery extends BaseQuery implements IConvertToNati if (!StringUtils.isEmpty(id)) { condition = condition.and("id", id, MongoOper.IS); } + if (!StringUtils.isEmpty(pid)) { + condition = condition.and("pid", pid, MongoOper.IS); + } if (!StringUtils.isEmpty(patientId)) { condition = condition.and("patientId", patientId, MongoOper.IS); } 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 c0848906..2fef918 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 @@ -229,10 +229,19 @@ public class AntenatalExaminationFacade { } // 修改关联券的使用状态,如果已使用,则返回错误码 + //初诊只能建一次 if (StringUtils.isNotBlank(model.getBarCode())) { - String code = patientCheckTicketService.updateTicket(model.getBarCode(), 2, model.getHospitalId()); - if (code != null) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg(code); + PatientCheckTicketQuery checkTicketQuery=new PatientCheckTicketQuery(); + checkTicketQuery.setPid(model.getPid()); + checkTicketQuery.setId(model.getBarCode()); + checkTicketQuery.setStatus(1); + if(patientCheckTicketService.queryTicketCount(checkTicketQuery)>0){ + String code = patientCheckTicketService.updateTicket(model.getBarCode(), 2, model.getHospitalId()); + if (code != null) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg(code); + } + }else{ + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("该产检劵不属于本人"); } } Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId()); @@ -370,13 +379,23 @@ public class AntenatalExaminationFacade { antExChuQuery1.setParentId(excAddRequest.getParentId()); antExChuQuery1.setYn(YnEnums.YES.getId()); List data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1); + + //初诊只能建一次 // 修改关联券的使用状态,如果已使用,则返回错误码 if (StringUtils.isNotBlank(antExChuModel.getBarCode())) { - String code = patientCheckTicketService.updateTicket(antExChuModel.getBarCode(), 2, antExChuModel.getHospitalId()); - if (code != null) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg(code); - } + PatientCheckTicketQuery checkTicketQuery=new PatientCheckTicketQuery(); + checkTicketQuery.setPid(antExChuModel.getPid()); + checkTicketQuery.setId(antExChuModel.getBarCode()); + checkTicketQuery.setStatus(1); + if(patientCheckTicketService.queryTicketCount(checkTicketQuery)>0){ + String code = patientCheckTicketService.updateTicket(antExChuModel.getBarCode(), 2, antExChuModel.getHospitalId()); + if (code != null) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg(code); + } + }else{ + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("该产检劵不属于本人"); + } } if (CollectionUtils.isEmpty(data1)) { Patients patients = patientsService.findOnePatientById(excAddRequest.getParentId()); -- 1.8.3.1