From 903e37e6bd566d6e999b268fdbd35b2cc254bfa3 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 10 Jan 2017 16:42:14 +0800 Subject: [PATCH] 1 --- .../biz/service/PatientCheckTicketService.java | 23 ++++++++++++++++++++++ .../lyms/platform/biz/service/PatientsService.java | 5 +++++ .../operate/web/facade/BabyBookbuildingFacade.java | 7 +++++-- .../operate/web/facade/MatDeliverFacade.java | 9 +-------- .../operate/web/facade/StopPregnancyFacade.java | 17 ++++------------ 5 files changed, 38 insertions(+), 23 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientCheckTicketService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientCheckTicketService.java index 051277f..7eec2f2 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientCheckTicketService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientCheckTicketService.java @@ -1,8 +1,10 @@ package com.lyms.platform.biz.service; +import com.lyms.platform.biz.dal.IPatientDao; import com.lyms.platform.biz.dal.PatientCheckTicketDao; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.pojo.PatientCheckTicket; +import com.lyms.platform.pojo.Patients; import com.lyms.platform.query.PatientCheckTicketQuery; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +22,8 @@ public class PatientCheckTicketService { @Autowired private PatientCheckTicketDao patientCheckTicketDao; + @Autowired + private IPatientDao patientDao; public PatientCheckTicket addTicket(PatientCheckTicket obj) { return patientCheckTicketDao.addTicket(obj); @@ -53,6 +57,25 @@ public class PatientCheckTicketService { patientCheckTicketDao.findAndModify(query.convertToQuery(),ticket); } + /** + * 作废产检劵 + * @param consumerHospitalId + * @param id + */ + public void cancelCheckTicket(String consumerHospitalId,String id){ + if(StringUtils.isNotEmpty(id)){ + PatientCheckTicketQuery patientCheckTicketQuery=new PatientCheckTicketQuery(); + Patients pa=patientDao.getPatient(id); + patientCheckTicketQuery.setStatus(1); + patientCheckTicketQuery.setPid(pa.getPid()); + PatientCheckTicket patientCheckTicket=new PatientCheckTicket(); + patientCheckTicket.setStatus(3); + patientCheckTicket.setConsumeHospitalId(consumerHospitalId); + findAndModify(patientCheckTicketQuery, patientCheckTicket); + } + } + + public PatientCheckTicket getTicket(String id) { return patientCheckTicketDao.getTicket(id); } 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 f0c1c70..1a1a542 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 @@ -36,6 +36,8 @@ public class PatientsService { private PersonService personService; @Autowired private IAntExRecordDao iAntExRecordDao; + @Autowired + private PatientCheckTicketService patientCheckTicketService; public Patients addPatient(Patients obj) { return iPatientDao.addPatient(obj); @@ -252,6 +254,9 @@ public class PatientsService { patients.setIsAutoFm(YnEnums.YES.getId()); // hujiaqi添加结束 updatePatient(patients); + + //作废产检劵 + patientCheckTicketService.cancelCheckTicket(patients.getHospitalId(), patients.getId()); PersonModelQuery personYunModelQuery = new PersonModelQuery(); personYunModelQuery.setYn(YnEnums.YES.getId()); personYunModelQuery.setId(patients.getPid()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index d01cf23..6d0c6c8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -71,7 +71,7 @@ public class BabyBookbuildingFacade { private PatientsService patientsService; @Autowired - private AntenatalExaminationService antenatalExaminationService; + private PatientCheckTicketService patientCheckTicketService; @Autowired private YunBookbuildingService yunBookbuildingService; @@ -410,10 +410,13 @@ public class BabyBookbuildingFacade { patientUpdate.setType(3); patientUpdate.setFmDate(StringUtils.isEmpty(request.getDueDate()) ? DateUtil.parseYMD(request.getBabyBirthday()) : DateUtil.parseYMD(request.getDueDate())); patientsService.updatePatientByPid(patientUpdate, pm.getId()); + + + //作废产检劵 + patientCheckTicketService.cancelCheckTicket(patients.getHospitalId(), patients.getId()); if (!isUpdatePatStatus) { isUpdatePatStatus = true; } - } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index a8e4dc0..fa70e4b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -262,14 +262,7 @@ public class MatDeliverFacade { //作废产检劵 - PatientCheckTicketQuery patientCheckTicketQuery=new PatientCheckTicketQuery(); - Patients pa=patientsService.findOnePatientById(deliverAddRequest.getParentId()); - patientCheckTicketQuery.setStatus(1); - patientCheckTicketQuery.setPid(pa.getPid()); - PatientCheckTicket patientCheckTicket=new PatientCheckTicket(); - patientCheckTicket.setStatus(3); - patientCheckTicket.setConsumeHospitalId(hospitalId); - patientCheckTicketService.findAndModify(patientCheckTicketQuery,patientCheckTicket); + patientCheckTicketService.cancelCheckTicket(hospitalId, deliverAddRequest.getParentId()); //修改 } else if (StringUtils.isNotEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java index 02ef62d..9cef928 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java @@ -128,7 +128,7 @@ public class StopPregnancyFacade { // hospitalId = String.valueOf(dbuser.getOrgId()); // } // } - + String hospital = autoMatchFacade.getHospitalId(userId); PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); @@ -158,8 +158,8 @@ public class StopPregnancyFacade { String groupId = groupsFacade.findByCurrentUserId(request.getHospitalId()); - List hos = groupsFacade.findGroupHospital(userId,false); - String hospital = autoMatchFacade.getHospitalId(userId); + List hos = groupsFacade.findGroupHospital(userId, false); + for (Patients patient : patients) { if (patient != null) { String hid = patient.getHospitalId(); @@ -211,16 +211,7 @@ public class StopPregnancyFacade { stopPregnancyService.addStopPreg(model); //作废产检劵 - PatientCheckTicketQuery patientCheckTicketQuery=new PatientCheckTicketQuery(); - Patients pa=patientsService.findOnePatientById(pat.getId()); - patientCheckTicketQuery.setStatus(1); - - patientCheckTicketQuery.setPid(pa.getPid()); - - PatientCheckTicket patientCheckTicket=new PatientCheckTicket(); - patientCheckTicket.setStatus(3); - patientCheckTicket.setConsumeHospitalId(autoMatchFacade.getHospitalId(userId)); - patientCheckTicketService.findAndModify(patientCheckTicketQuery,patientCheckTicket); + patientCheckTicketService.cancelCheckTicket(hospital, pat.getId()); BaseResponse objectResponse = new BaseResponse(); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); -- 1.8.3.1