From 69c6dc5d69272c483824dc2e9cb66bcc288ae047 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 31 Aug 2016 18:44:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/biz/service/PatientsService.java | 68 ++++++++++++++-------- 1 file changed, 45 insertions(+), 23 deletions(-) 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 6046850..5775f12 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 @@ -1,6 +1,5 @@ package com.lyms.platform.biz.service; -import com.lyms.platform.biz.dal.IAntenatalExaminationDao; import com.lyms.platform.biz.dal.IPatientDao; import com.lyms.platform.biz.dal.ISieveApplyOrderDao; import com.lyms.platform.biz.dal.ISieveDao; @@ -9,8 +8,8 @@ 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; -import com.lyms.platform.pojo.AntenatalExaminationModel; import com.lyms.platform.pojo.Patients; +import com.lyms.platform.pojo.SieveApplyOrderModel; import com.lyms.platform.pojo.SieveModel; import com.lyms.platform.query.AntExQuery; import com.lyms.platform.query.PatientsQuery; @@ -18,7 +17,6 @@ import com.lyms.platform.query.SieveApplyOrderQuery; import com.lyms.platform.query.SieveQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; @@ -39,6 +37,7 @@ public class PatientsService { private ISieveDao sieveDao; @Autowired private ISieveApplyOrderDao sieveApplyOrderDao; + public Patients addPatient(Patients obj) { return iPatientDao.addPatient(obj); } @@ -46,9 +45,11 @@ public class PatientsService { public void updatePatient(Patients obj) { iPatientDao.updatePatient(obj, obj.getId()); } - public void findAndModify(PatientsQuery query,Patients obj){ + + public void findAndModify(PatientsQuery query, Patients obj) { iPatientDao.findAndModify(query.convertToQuery(), obj); } + public List queryPatient(PatientsQuery patientsQuery) { MongoQuery query = patientsQuery.convertToQuery(); if (StringUtils.isNotEmpty(patientsQuery.getNeed())) { @@ -59,7 +60,7 @@ public class PatientsService { return iPatientDao.queryPatient(query.addOrder(Sort.Direction.DESC, "id")); } - public List findLatelyCreated(MongoQuery mongoQuery){ + public List findLatelyCreated(MongoQuery mongoQuery) { return iPatientDao.queryPatient(mongoQuery); } @@ -161,21 +162,20 @@ public class PatientsService { /** * 删除过期产筛的数据，删掉自动到期的部分 - * */ - public void delSieve(){ + public void delSieve() { SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setYn(YnEnums.YES.getId()); Date endDate = DateUtil.addDay(new Date(), -146); sieveQuery.setLastMensesStart(endDate); List list = sieveDao.queryList(sieveQuery.convertToQuery()); - if(CollectionUtils.isNotEmpty(list)){ - for(SieveModel sieveModel:list) { - SieveApplyOrderQuery sieveApplyOrderQuery=new SieveApplyOrderQuery(); + if (CollectionUtils.isNotEmpty(list)) { + for (SieveModel sieveModel : list) { + SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); sieveApplyOrderQuery.setParentId(sieveModel.getParentId()); sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); - List list1 = sieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery()); - if(CollectionUtils.isEmpty(list1)){ + List list1 = sieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery()); + if (CollectionUtils.isEmpty(list1)) { sieveModel.setYn(YnEnums.NO.getId()); sieveDao.updateChanQianSieve(sieveModel); } @@ -186,14 +186,14 @@ public class PatientsService { /** * 自动分娩产妇的 */ - public void autoMatDeliver(){ + public void autoMatDeliver() { Date endDate = DateUtil.addDay(new Date(), -293); - PatientsQuery patientsQuery=new PatientsQuery(); + PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setType(1); patientsQuery.setLastMensesStart(endDate); List patientses = queryPatient(patientsQuery); - for(Patients patients:patientses){ + for (Patients patients : patientses) { patients.setType(3); patients.setBuildType(2); patients.setFmDate(new Date()); @@ -201,6 +201,7 @@ public class PatientsService { updatePatient(patients); } } + /** * 孕妇建档时调用的方法或者修改末次月经后调用 * @@ -219,9 +220,36 @@ public class PatientsService { SieveModel sieveModel = convertToModel(patients); sieveModel.setFrom("1"); sieveDao.addChanQianSieve(sieveModel); - }else{ + } else { //修改孕妇基本信息 - for(SieveModel sieveModel:list){ + for (SieveModel sieveModel : list) { + sieveModel.setPhone(patients.getPhone()); + sieveModel.setName(patients.getUsername()); + sieveModel.setLastMenses(patients.getLastMenses()); + sieveModel.setCardNo(patients.getCardNo()); + sieveDao.updateChanQianSieve(sieveModel); + } + } + } else { + + SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); + sieveApplyOrderQuery.setParentId(patients.getId()); + sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); + sieveApplyOrderQuery.setHospitalId(patients.getHospitalId()); + List list1 = sieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery()); + if (CollectionUtils.isEmpty(list1)) { + //修改孕妇末次月经不满足条件删除产筛数据 + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setYn(YnEnums.YES.getId()); + sieveQuery.setParentId(patients.getId()); + sieveDao.deleteById(sieveQuery.convertToQuery()); + } else { + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setYn(YnEnums.YES.getId()); + sieveQuery.setParentId(patients.getId()); + List list = sieveDao.queryList(sieveQuery.convertToQuery()); + //修改孕妇基本信息 + for (SieveModel sieveModel : list) { sieveModel.setPhone(patients.getPhone()); sieveModel.setName(patients.getUsername()); sieveModel.setLastMenses(patients.getLastMenses()); @@ -229,12 +257,6 @@ public class PatientsService { sieveDao.updateChanQianSieve(sieveModel); } } - }else{ - //修改孕妇末次月经不满足条件删除产筛数据 - SieveQuery sieveQuery = new SieveQuery(); - sieveQuery.setYn(YnEnums.YES.getId()); - sieveQuery.setParentId(patients.getId()); - sieveDao.deleteById(sieveQuery.convertToQuery()); } } } -- 1.8.3.1