From 0057bc6a3e51034c7973312fc56317e1bec5492b Mon Sep 17 00:00:00 2001 From: yangfei Date: Wed, 27 Sep 2017 20:43:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/BabyEarFacade.java | 79 ++++++++++++++++------ .../platform/operate/web/request/BabyEarBase.java | 1 + 2 files changed, 58 insertions(+), 22 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java index f44a57c..8aa48ff 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java @@ -263,6 +263,50 @@ public class BabyEarFacade { } /** + * mogodb建立隐藏档案 + * + * @param babyId + * @param hospitalId + * @param enable + * @return + */ + public String addhideMongoBaby(String babyId, String hospitalId, String enable) { + if (StringUtils.isEmpty(babyId) || StringUtils.isEmpty(hospitalId)) { + return null; + } + + BabyModel babyModel = babyService.getOneBabyById(babyId); + + //建立儿童隐藏档案 + if (babyModel != null) { + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setHospitalId(hospitalId); + babyQuery.setPid(babyModel.getPid()); + + List babyModels = babyService.queryBabyWithQuery(babyQuery); + if (CollectionUtils.isEmpty(babyModels)) { + babyModel.setHospitalId(hospitalId); + babyModel.setYn(YnEnums.YES.getId()); + babyModel.setCreated(new Date()); + babyModel.setId(null); + //2-隐藏建档 0--转诊 + babyModel.setEnable(enable); + //隐藏建档需要baby来源id + if (enable.equals("2")) { + if (StringUtils.isEmpty(babyModel.getSource())) { + babyModel.setSource(babyId); + } + } + babyModel.setBuildType(3); + babyModel.setBuildDoctor(null); + babyModel.setBuildDate(new Date()); + return babyService.addOneBaby(babyModel).getId(); + } + } + return null; + } + + /** * 增加儿童隐藏建档 * * @param babyId 儿童档案Id @@ -295,7 +339,9 @@ public class BabyEarFacade { babyModel.setEnable(enable); //隐藏建档需要baby来源id if (enable.equals("2")) { - babyModel.setSource(babyId); + if (StringUtils.isEmpty(babyModel.getSource())) { + babyModel.setSource(babyId); + } } babyModel.setBuildType(3); babyModel.setBuildDoctor(null); @@ -305,7 +351,6 @@ public class BabyEarFacade { BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery(); earQuery.setBabyPatientId(babyId); - // earQuery.setCreateHospitalId(hospitalId); List ears = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); BabyPatientExtendEar ear = ears.get(0); //如果不相同转诊档案 @@ -399,7 +444,6 @@ public class BabyEarFacade { BabyEarBase babyEarBase = babyEarAddRequest.getBase(); //获取儿童信息 IBasicRequestConvert convert = babyEarBase; - //儿童基本信息 BabyModel baby = convert.convertToDataModel(); //儿童出生信息 @@ -417,11 +461,10 @@ public class BabyEarFacade { if (null != baby) { String pid = null; - if (StringUtils.isNotEmpty(baby.getId())) {//修改儿童信息 - BabyModel babyModel = babyService.getOneBabyById(baby.getId()); - //跟距母亲证件号查询儿童person信息 + if (StringUtils.isNotEmpty(baby.getPid())) {//更新本院儿童信息 + //根据pid查询儿童信息并进行更新 PersonModelQuery personModelQuery = new PersonModelQuery(); - personModelQuery.setId(babyModel.getPid()); + personModelQuery.setId(baby.getPid()); List babyP = personService.queryPersons(personModelQuery); if (CollectionUtils.isNotEmpty(babyP)) { PersonModel personModel = babyP.get(0); @@ -433,23 +476,13 @@ public class BabyEarFacade { personService.updatePerson(personModel, personModel.getId()); } } else {//新增儿童信息 - //处理儿童person信息 pid = handBabyPerson(baby).getId(); } - - babyEarAddResult.setpId(pid); + //babyId String babyPatientId = ""; - - BabyModelQuery babyQuery = new BabyModelQuery(); - babyQuery.setPid(pid); - babyQuery.setHospitalId(hId); - List babyModels = babyService.queryBabyWithQuery(babyQuery); - - if (CollectionUtils.isNotEmpty(babyModels)) {//修改 - BabyModel babyModel = babyModels.get(0); - baby.setId(babyModel.getId()); - babyService.updateOneBaby(baby, babyModel.getId()); - babyPatientId = babyModel.getId(); + if (StringUtils.isNotEmpty(baby.getId())) {//更新本院儿童信息 + babyService.updateOneBaby(baby, baby.getId()); + babyPatientId = baby.getId(); } else {//新增 baby.setId(null); baby.setPid(pid); @@ -459,6 +492,8 @@ public class BabyEarFacade { baby.setCreated(new Date()); babyPatientId = babyService.addOneBaby(baby).getId(); } + + babyEarAddResult.setpId(pid); babyEarAddResult.setBabyId(babyPatientId); //数据转换 @@ -1307,7 +1342,7 @@ public class BabyEarFacade { } babyEarBirthView.setFetuEmbarras(fetuStr); - String apgarScore =""; + String apgarScore = ""; if (babyPatientExtendEarBirth.getApgarScoreOne() != null && babyPatientExtendEarBirth.getApgarScoreFive() != null && babyPatientExtendEarBirth.getApgarScoreTen() != null) { apgarScore = babyPatientExtendEarBirth.getApgarScoreOne() + UnitConstants.FEN + " - " + babyPatientExtendEarBirth.getApgarScoreFive() + UnitConstants.FEN + " - " + babyPatientExtendEarBirth.getApgarScoreTen() + UnitConstants.FEN; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java index 868d340..d9b95b2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java @@ -178,6 +178,7 @@ public class BabyEarBase implements IBasicRequestConvert { babyModel.setMcertTypeId(mcertTypeId); babyModel.setmLevelId(mLevelId); babyModel.setId(babyId); + babyModel.setPid(pid); babyModel.setMremark(remark); babyModel.setVcCardNo(vcCardNo); babyModel.setServiceType(serviceType); -- 1.8.3.1