diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientDao.java index 5efc532..35110e2 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientDao.java @@ -28,4 +28,6 @@ public interface IPatientDao { Patients findLastBuildRecord(String pid, int yn); void updatePatientByPid(Patients patientUpdate, String pid); + + void findAndModify(MongoQuery query,Patients obj); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientDaoImpl.java index 92d8f41..dfd7f95 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientDaoImpl.java @@ -14,6 +14,7 @@ import org.springframework.data.mongodb.core.aggregation.AggregationOperation; import org.springframework.data.mongodb.core.aggregation.AggregationResults; import org.springframework.data.mongodb.core.aggregation.Field; import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; import java.util.List; @@ -30,7 +31,9 @@ public class PatientDaoImpl extends BaseMongoDAOImpl implements IPatie public Patients addPatient(Patients obj) { return save(obj); } - + public void findAndModify(MongoQuery query,Patients obj){ + findAndModify(query.convertToMongoQuery(),obj); + } @Override public void updatePatient(Patients obj, String id) { update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), obj); 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 406360e..038c377 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,8 +36,6 @@ public class PatientsService { private IPatientDao iPatientDao; @Autowired private ISieveDao sieveDao; - @Autowired - private IAntenatalExaminationDao iAntenatalExaminationDao; public Patients addPatient(Patients obj) { return iPatientDao.addPatient(obj); @@ -46,7 +44,9 @@ public class PatientsService { public void updatePatient(Patients obj) { iPatientDao.updatePatient(obj, obj.getId()); } - + 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())) { 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 6419097..5bf9e03 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 @@ -217,10 +217,15 @@ public class AntenatalExaminationFacade { } } catch (Exception e) { } + patientsService.updatePatient(patients); if (!list.isEmpty()) { - patients.setRiskLevelId(JsonUtil.array2JsonString(list)); + Patients patients1 = new Patients(); + patients1.setRiskLevelId(JsonUtil.array2JsonString(list)); + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setPid(patients.getPid()); + patientsQuery.setYn(YnEnums.YES.getId()); + patientsService.findAndModify(patientsQuery, patients1); } - patientsService.updatePatient(patients); } /** @@ -231,24 +236,23 @@ public class AntenatalExaminationFacade { * @return */ public HighScoreResult findLastRisk(String pid, boolean needLevel) { - HighScoreResult highScoreResult = getPatLastRiskByDate(pid,needLevel,null); + HighScoreResult highScoreResult = getPatLastRiskByDate(pid, needLevel, null); return highScoreResult; } /** * 查询当前产程孕妇高危因素 + * * @param pid * @param needLevel * @param date * @return */ - public HighScoreResult getPatLastRiskByDate(String pid, boolean needLevel,Date date) - { - AntExQuery antExQuery=new AntExQuery(); + public HighScoreResult getPatLastRiskByDate(String pid, boolean needLevel, Date date) { + AntExQuery antExQuery = new AntExQuery(); antExQuery.setPid(pid); antExQuery.setYn(YnEnums.YES.getId()); - if (date != null) - { + if (date != null) { antExQuery.setStart(date); } List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "modified")); @@ -308,8 +312,7 @@ public class AntenatalExaminationFacade { //初诊 AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setPid(pid); - if (date != null) - { + if (date != null) { antExChuQuery.setStart(date); } antExChuQuery.setYn(YnEnums.YES.getId()); @@ -445,7 +448,7 @@ public class AntenatalExaminationFacade { if (null != an.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); } - data.add(new AntData(an, null != organization ? organization.getName() : "",patients.getLastMenses())); + data.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses())); } } @@ -461,7 +464,7 @@ public class AntenatalExaminationFacade { if (null != an.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); } - data.add(new AntData(an, null != organization ? organization.getName() : "",patients.getLastMenses())); + data.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses())); } } @@ -495,7 +498,7 @@ public class AntenatalExaminationFacade { if (null != postReviewModel.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId())); } - data.add(new AntData(postReviewModel, null != organization ? organization.getName() : "",patients.getFmDate())); + data.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patients.getFmDate())); } } @@ -660,11 +663,11 @@ public class AntenatalExaminationFacade { Organization organization = null; if (CollectionUtils.isNotEmpty(antExChulist)) { for (AntExChuModel antExChuModel1 : antExChulist) { - Patients patients =patientsService.findOnePatientById(antExChuModel1.getParentId()); + Patients patients = patientsService.findOnePatientById(antExChuModel1.getParentId()); if (null != antExChuModel1.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(antExChuModel1.getHospitalId())); } - dataList.add(new AntData(antExChuModel1, null != organization ? organization.getName() : "",patients.getLastMenses())); + dataList.add(new AntData(antExChuModel1, null != organization ? organization.getName() : "", patients.getLastMenses())); } } if (CollectionUtils.isNotEmpty(list)) { @@ -672,8 +675,8 @@ public class AntenatalExaminationFacade { if (null != model.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId())); } - Patients patients =patientsService.findOnePatientById(model.getParentId()); - dataList.add(new AntData(model, null != organization ? organization.getName() : "",patients.getLastMenses())); + Patients patients = patientsService.findOnePatientById(model.getParentId()); + dataList.add(new AntData(model, null != organization ? organization.getName() : "", patients.getLastMenses())); } } return dataList; @@ -797,7 +800,7 @@ public class AntenatalExaminationFacade { basicConfigQuery.setId(basicConfig.getParentId()); List basicConfigs2 = basicConfigService.queryBasicConfig(basicConfigQuery); if (CollectionUtils.isNotEmpty(basicConfigs2)) { - for (BasicConfig bc:basicConfigs2) { + for (BasicConfig bc : basicConfigs2) { String name = bc.getName(); if (name.indexOf("预警") > -1) { name = name.replace("预警", "");