From 1e311a32cca9d472f479f93e5c308463d72f3ae1 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 24 Jun 2020 17:45:48 +0800 Subject: [PATCH] update --- .../operate/web/facade/AntExRecordFacade.java | 25 ++++++++++++++++++++-- .../operate/web/facade/ApplyOrderFacade.java | 4 ++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index dd110fe..cb904f3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -1572,9 +1572,30 @@ public class AntExRecordFacade { if (falg) { //创建一条复诊记录 Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("hospitalId").is(hospitalId).and("type").is(1).and("yn").is(1)), Patients.class); + //当前医院没有档案,创建隐藏档案 + if (patients == null) + { + patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("type").is(1).and("yn").is(1).and("source").exists(false)), Patients.class); + if (patients != null) + { + String source = patients.getId(); + patients.setId(null); + patients.setSource(source); + patients.setEnable("2");//隐藏档案 + patients.setHospitalId(hospitalId); + patients = patientsService.addPatient(patients); + } + } if (null != patients) { - AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(patients.getId())), AntExChuModel.class); - if (null != antExChuModel) { + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setYn(YnEnums.YES.getId()); + antExChuQuery.setPid(patients.getPid()); + antExChuQuery.setCheckTimeStart(patients.getLastMenses()); + antExChuQuery.setCheckTimeEnd(DateUtil.addWeek(patients.getLastMenses(),42)); + List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); + if (CollectionUtils.isNotEmpty(antExChuModels)) { + AntExChuModel antExChuModel = antExChuModels.get(0); + AntExAddRequest antExAddRequest = new AntExAddRequest(); antExAddRequest.setCheckDate(DateUtil.getyyyy_MM_dd(new Date())); antExAddRequest.setCheckDoctor(doctorId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index d469f0c..4a97a7e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -1805,8 +1805,8 @@ public class ApplyOrderFacade { sieveHuada.setGestationalWeeks(getWeeks(sieveHuada.getGestationalWeeks()));//孕周 sieveHuada.setChargeType("3"); sieveHuada.setSampleType("S051"); - sieveHuada.setIsNeedOtherChromReport("0"); - sieveHuada.setIsNeedReportOtherResult("0"); + sieveHuada.setIsNeedOtherChromReport("1"); + sieveHuada.setIsNeedReportOtherResult("1"); Map signParams = getSignParams(SYSCODE, SECRET); -- 1.8.3.1