From 9abb814600a400724963078bdec9c59f6a9b0b6d Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 29 Aug 2017 15:08:47 +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 --- .../web/controller/HearDiagnManageController.java | 15 +++----- .../operate/web/facade/BabyBookbuildingFacade.java | 3 -- .../platform/operate/web/facade/BabyEarFacade.java | 44 +++++++++++++++++++--- 3 files changed, 44 insertions(+), 18 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java index f31b5fd..369304f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java @@ -14,6 +14,7 @@ import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.facade.AutoMatchFacade; +import com.lyms.platform.operate.web.facade.BabyEarFacade; import com.lyms.platform.operate.web.request.HearDiaManageRequest; import com.lyms.platform.operate.web.result.HearDiagnManageListResult; import com.lyms.platform.operate.web.result.HearingDiagnoseListResult; @@ -63,6 +64,8 @@ public class HearDiagnManageController extends BaseController { private BabyPatientExtendEarService babyPatientExtendEarService; @Autowired private BabyPatientExtendEarBabyService earBabyService; + @Autowired + private BabyEarFacade earFacade; /** * 获取儿童听筛记录 @@ -81,24 +84,18 @@ public class HearDiagnManageController extends BaseController { //当前登录人医院Id String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); - //根据医院查询区域 - - //根据babyid查询pid - - //根据pid查询babyId - - + List babyIds = earFacade.getBabyIdsByItemOrg(babyId,hospitalId); //儿童听筛记录 BabyPatientExtendEarScreenQuery earScreenQuery = new BabyPatientExtendEarScreenQuery(); - earScreenQuery.setBabyId(babyId); + earScreenQuery.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()])); earScreenQuery.setSort("screen_date"); List earScreenList = screenService.queryBabyPatientExtendEarScreen(earScreenQuery); //儿童听力诊断记录 BabyPatientExtendEarHearingDiagnoseQuery hearingDiagnoseQuery = new BabyPatientExtendEarHearingDiagnoseQuery(); - hearingDiagnoseQuery.setBabyId(babyId); + hearingDiagnoseQuery.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()])); hearingDiagnoseQuery.setIfdel(0); hearingDiagnoseQuery.setSort("diagnose_time"); List hearingDiagnoseList = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnose(hearingDiagnoseQuery); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 81e81d3..927f1aa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -2376,8 +2376,6 @@ public class BabyBookbuildingFacade { if (StringUtils.isNotEmpty(cardNo)) ; { - - BabyModelQuery babyQuery = new BabyModelQuery(); //去掉yn为1的，程序去处理优化查询 // babyQuery.setYn(YnEnums.YES.getId()); @@ -2413,7 +2411,6 @@ public class BabyBookbuildingFacade { result.setApgarScore(JsonUtil.str2Obj(babyModel.getApgarScore(), Map.class)); result.setmHighRiskReason(babyModel.getmHighRiskReason()); - result.setFatherProfessionTypeId(babyModel.getFproTypeId()); } else { patientsQuery.setPhoneOrCert(cardNo); 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 6b2fb69..9d3f68f 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 @@ -98,7 +98,6 @@ public class BabyEarFacade { private BabyPatientExtendEarBabyService earBabyService; - //处理儿童person信息 private PersonModel handBabyPerson(BabyModel baby) { //跟距母親的證件號查詢兒童person信息 @@ -181,6 +180,39 @@ public class BabyEarFacade { // childrenRecordService.addChildrenRecord(childrenRecord); }*/ + /** + * 根据babyid和医院Id获取babyIds + * @param babyId + * @param hospitalId + * @return + */ + public List getBabyIdsByItemOrg(String babyId, String hospitalId) { + List babyIds = new ArrayList<>(); + babyIds.add(babyId); + //机构内的医院集合 + List hospitIds = getOrgHospitalIds(hospitalId); + BabyPatientExtendEarBabyQuery extendEarBabyQuery = new BabyPatientExtendEarBabyQuery(); + extendEarBabyQuery.setBabyPatientId(babyId); + //根据babyId查询是否存 + BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery(); + earQuery.setBabyPatientId(babyId); + List babyPatientExtendEars = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); + if (CollectionUtils.isNotEmpty(babyPatientExtendEars)) { + BabyPatientExtendEar babyPatientExtendEar = babyPatientExtendEars.get(0); + String personId = babyPatientExtendEar.getPersonId(); + earQuery = new BabyPatientExtendEarQuery(); + earQuery.setPersonId(personId); + earQuery.setCreateHospitalIds((String[]) hospitIds.toArray(new String[hospitIds.size()])); + + List babyPatientExtendEars1 = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); + if (CollectionUtils.isNotEmpty(babyPatientExtendEars1)) { + for(BabyPatientExtendEar ear:babyPatientExtendEars1){ + babyIds.add(ear.getBabyPatientId()); + } + } + } + return babyIds; + } /** * 显示儿童隐藏建档 @@ -225,7 +257,7 @@ public class BabyEarFacade { */ public boolean addhideBabyEar(String babyId, String hospitalId) { - if(StringUtils.isEmpty(babyId)||StringUtils.isEmpty(hospitalId)){ + if (StringUtils.isEmpty(babyId) || StringUtils.isEmpty(hospitalId)) { return false; } @@ -423,11 +455,11 @@ public class BabyEarFacade { extendEarBabyQuery.setBabyPatientId(babyPatientId); List babyPatientExtendEarBabies = babyPatientExtendEarBabyService.queryBabyPatientExtendEarBaby(extendEarBabyQuery); - if(CollectionUtils.isNotEmpty(babyPatientExtendEarBabies)){ + if (CollectionUtils.isNotEmpty(babyPatientExtendEarBabies)) { BabyPatientExtendEarBaby earBaby = babyPatientExtendEarBabies.get(0); babyPatientExtendEarBaby.setId(earBaby.getId()); babyPatientExtendEarBabyService.updateBabyPatientExtendEarBaby(babyPatientExtendEarBaby); - }else{ + } else { babyPatientExtendEarBaby.setId(UUID.randomUUID().toString().replace("-", "")); babyPatientExtendEarBabyService.addBabyPatientExtendEarBaby(babyPatientExtendEarBaby); } @@ -756,7 +788,7 @@ public class BabyEarFacade { String hfString = null; if (historyStr.toString().endsWith(",")) { hfString = historyStr.substring(0, historyStr.length() - 1); - }else{ + } else { hfString = historyStr.toString(); } babyEarFamilyView.setBadLifeHistory(hfString); @@ -1595,7 +1627,7 @@ public class BabyEarFacade { babyPatientExtendEarScreenService.addBabyPatientExtendEarScreen(babyPatientExtendEarScreen); //听力筛查-当某个儿童在同一院组内某家医院完成了的听筛建档后去院组内其他医院做了听筛、听诊或随访，应该要在对应的医院下创建一个隐藏档案 //建立隐藏档案 - addhideBabyEar(babyPatientExtendEarScreen.getBabyId(),hId); + addhideBabyEar(babyPatientExtendEarScreen.getBabyId(), hId); } else { babyPatientExtendEarScreen.setLastUpdateDate(new Date()); babyPatientExtendEarScreen.setLastUpdateUserId(userId + ""); -- 1.8.3.1