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 3ffa49c..26b027d 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 @@ -11,11 +11,9 @@ 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; -import com.lyms.platform.query.SieveApplyOrderQuery; import com.lyms.platform.query.SieveQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; @@ -24,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -121,32 +118,53 @@ public class PatientsService { } } /** - SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); - sieveApplyOrderQuery.setStatus(0); - sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); - //查询转诊申请单 - List list = iSieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery()); - if (CollectionUtils.isNotEmpty(list)) { - List idList = new ArrayList<>(); - for (SieveApplyOrderModel orderModel : list) { - if (null != orderModel.getParentId()) { - Patients patients = iPatientDao.getPatient(orderModel.getParentId()); - if (null != patients) { - SieveModel sieveModel = convertToModel(patients); - sieveDao.addChanQianSieve(sieveModel); - } - idList.add(orderModel.getId()); + SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); + sieveApplyOrderQuery.setStatus(0); + sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); + //查询转诊申请单 + List list = iSieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery()); + if (CollectionUtils.isNotEmpty(list)) { + List idList = new ArrayList<>(); + for (SieveApplyOrderModel orderModel : list) { + if (null != orderModel.getParentId()) { + Patients patients = iPatientDao.getPatient(orderModel.getParentId()); + if (null != patients) { + SieveModel sieveModel = convertToModel(patients); + sieveDao.addChanQianSieve(sieveModel); + } + idList.add(orderModel.getId()); + } + } + SieveApplyOrderModel sieveApplyOrderModel = new SieveApplyOrderModel(); + sieveApplyOrderModel.setStatus(1); + for (String str : idList) { + sieveApplyOrderModel.setId(str); + sieveApplyOrderModel.setModified(new Date()); + sieveApplyOrderModel.setStatus(1); + iSieveApplyOrderDao.updateSieve(sieveApplyOrderModel); + } + }**/ + } + + /** + * 孕妇建档时调用的方法 + * + * @param patients + */ + public void validata(Patients patients) { + if (null != patients && null != patients.getLastMenses()) { + int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); + if (days >= 108 && days <= 146) { + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setYn(YnEnums.YES.getId()); + sieveQuery.setParentId(patients.getId()); + List list = sieveDao.queryList(sieveQuery.convertToQuery()); + if (CollectionUtils.isEmpty(list)) { + SieveModel sieveModel = convertToModel(patients); + sieveDao.addChanQianSieve(sieveModel); } } - SieveApplyOrderModel sieveApplyOrderModel = new SieveApplyOrderModel(); - sieveApplyOrderModel.setStatus(1); - for (String str : idList) { - sieveApplyOrderModel.setId(str); - sieveApplyOrderModel.setModified(new Date()); - sieveApplyOrderModel.setStatus(1); - iSieveApplyOrderDao.updateSieve(sieveApplyOrderModel); - } - }**/ + } } public SieveModel convertToModel(Patients patients) { @@ -175,11 +193,11 @@ public class PatientsService { } public Patients findLastBuildRecord(String pid, int yn) { - return iPatientDao.findLastBuildRecord(pid,yn); + return iPatientDao.findLastBuildRecord(pid, yn); } public void updatePatientByPid(Patients patientUpdate, String pid) { - iPatientDao.updatePatientByPid(patientUpdate,pid); + iPatientDao.updatePatientByPid(patientUpdate, pid); } private class PatientWorker extends Thread {