From 93a20c8f73daa32bb9b9c732f2d9ce031cc3d025 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sat, 6 Jun 2020 18:01:59 +0800 Subject: [PATCH] update --- .../operate/web/controller/TestController.java | 48 ++++++++++++---------- .../web/facade/DischargeAbstractFacade.java | 7 ++++ .../operate/web/facade/MatDeliverFacade.java | 16 +++++--- 3 files changed, 43 insertions(+), 28 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 887226a..b02a995 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -3665,20 +3665,21 @@ public class TestController extends BaseController { public void run() { if (CollectionUtils.isNotEmpty(tempList)) { for (MaternalDeliverModel maternalDeliverModel : tempList) { - Patients patients = patientsService.findOnePatientById(maternalDeliverModel.getParentId()); - if (patients != null && StringUtils.isNotEmpty(maternalDeliverModel.getFmHospital()) - && StringUtils.isNotEmpty(patients.getFmHospital())) { - if (!maternalDeliverModel.getFmHospital().equals(patients.getFmHospital())) - { - patients.setFmHospital(maternalDeliverModel.getFmHospital()); - patientsService.updatePatient(patients); - } - } +// Patients patients = patientsService.findOnePatientById(maternalDeliverModel.getParentId()); +// if (patients != null && StringUtils.isNotEmpty(maternalDeliverModel.getFmHospital()) +// && StringUtils.isNotEmpty(patients.getFmHospital())) { +// if (!maternalDeliverModel.getFmHospital().equals(patients.getFmHospital())) +// { +// patients.setFmHospital(maternalDeliverModel.getFmHospital()); +// patientsService.updatePatient(patients); +// } +// } PatientsQuery patientsQuery1 = new PatientsQuery(); patientsQuery1.setHospitalId(maternalDeliverModel.getFmHospital()); patientsQuery1.setYn(YnEnums.YES.getId()); patientsQuery1.setSort("created"); + patientsQuery1.setLastMensesStart(DateUtil.addDay(new Date(), -280)); patientsQuery1.setPid(maternalDeliverModel.getPid()); List list = patientsService.queryPatient(patientsQuery1); if (CollectionUtils.isNotEmpty(list)) @@ -3715,23 +3716,26 @@ public class TestController extends BaseController { List list = patientsService.queryPatient(patientsQuery1); if (CollectionUtils.isNotEmpty(list)) { - PersonModel persons = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(cardNo)), PersonModel.class); - if (persons != null) + for (Patients pat : list) { - persons.setType(1); - personService.updatePerson(persons, persons.getId()); - Patients pat = list.get(0); - if ("0001-01-01".equals(DateUtil.getyyyy_MM_dd(pat.getLastMenses()))) + PersonModel persons = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(cardNo)), PersonModel.class); + if (persons != null) { - Date lastMensesDate = DateUtil.parseYMD(lastMenses); - pat.setLastMenses(lastMensesDate); - pat.setDueDate(DateUtil.addDay(lastMensesDate, 280)); - pat.setIsAutoFm(0); - pat.setType(1); - patientsService.updatePatient(pat); - this.mongoTemplate.updateFirst(new Query(Criteria.where("id").is(pat.getId())), Update.update("fmDate", null), Patients.class); + persons.setType(1); + personService.updatePerson(persons, persons.getId()); + if ("0001-01-01".equals(DateUtil.getyyyy_MM_dd(pat.getLastMenses()))) + { + Date lastMensesDate = DateUtil.parseYMD(lastMenses); + pat.setLastMenses(lastMensesDate); + pat.setDueDate(DateUtil.addDay(lastMensesDate, 280)); + pat.setIsAutoFm(0); + pat.setType(1); + patientsService.updatePatient(pat); + this.mongoTemplate.updateFirst(new Query(Criteria.where("id").is(pat.getId())), Update.update("fmDate", null), Patients.class); + } } } + } objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java index bcf48f6..78b8ac6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java @@ -453,6 +453,13 @@ public class DischargeAbstractFacade extends BaseServiceImpl { map.put("fmDate", DateUtil.getyyyy_MM_dd(patients.getFmDate())); MaternalDeliverModel maternalDeliverModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(patients.getId())), MaternalDeliverModel.class); + if (maternalDeliverModel == null) + { + continue; + } + + + map.put("tireNumber", maternalDeliverModel.getTireNumber()); String rFactor = commonService.resloveFactor(patients.getRiskFactorId()); if (patients.getoRiskFactor() != null && !"null".equals(patients.getoRiskFactor())) { 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 ddd4b25..ae68448 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 @@ -236,6 +236,7 @@ public class MatDeliverFacade { patientsQuery.setId(parentId); patientsQuery.setLastMensesStart(DateUtil.addDay(new Date(),-280)); patientsQuery.setSort(" created "); + //验证当前分娩机构是否有档案 如果没有档案通过pid查询到当前孕妇的其他医院建档信息 增加隐藏档案 List patients = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isEmpty(patients)) { @@ -244,19 +245,22 @@ public class MatDeliverFacade { patientsQuery.setId(null); patientsQuery.setPid(deliverAddRequest.getPid()); patientsQuery.setSort(" created "); + patientsQuery.setLastMensesStart(DateUtil.addDay(new Date(), -280)); List patientsss = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(patientsss)) { Patients pat = patientsss.get(0); String source = pat.getSource() == null ? pat.getId() : pat.getSource(); - pat.setId(null); + String uuid = com.lyms.platform.common.utils.StringUtils.uuid(); + pat.setId(uuid); pat.setEnable("2"); - pat.setHospitalId(maternalDeliverModel.getFmHospital()); + pat.setHospitalId(hospitalId); pat.setSource(source); - - pat = patientsService.addPatient(pat); - maternalDeliverModel.setParentId(pat.getId()); - deliverAddRequest.setParentId(pat.getId()); + pat.setFmHospital(hospitalId); + pat.setShortCode("1"); + patientsService.addPatient(pat); + maternalDeliverModel.setParentId(uuid); + deliverAddRequest.setParentId(uuid); } } else -- 1.8.3.1