jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9abb814600a400724963078bdec9c59f6a9b0b6d

Authored by yangfei
1 parent 94e60a16c1
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

听力诊断模块

Showing 3 changed files with 44 additions and 18 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java View file @ 9abb814
... ... @@ -14,6 +14,7 @@
14 14 import com.lyms.platform.common.result.BaseResponse;
15 15 import com.lyms.platform.common.utils.DateUtil;
16 16 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
  17 +import com.lyms.platform.operate.web.facade.BabyEarFacade;
17 18 import com.lyms.platform.operate.web.request.HearDiaManageRequest;
18 19 import com.lyms.platform.operate.web.result.HearDiagnManageListResult;
19 20 import com.lyms.platform.operate.web.result.HearingDiagnoseListResult;
... ... @@ -63,6 +64,8 @@
63 64 private BabyPatientExtendEarService babyPatientExtendEarService;
64 65 @Autowired
65 66 private BabyPatientExtendEarBabyService earBabyService;
  67 + @Autowired
  68 + private BabyEarFacade earFacade;
66 69  
67 70 /**
68 71 * 获取儿童听筛记录
69 72  
70 73  
71 74  
72 75  
... ... @@ -81,24 +84,18 @@
81 84 //当前登录人医院Id
82 85 String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
83 86  
84   - //根据医院查询区域
  87 + List<String> babyIds = earFacade.getBabyIdsByItemOrg(babyId,hospitalId);
85 88  
86   - //根据babyid查询pid
87 89  
88   - //根据pid查询babyId
89   -
90   -
91   -
92   -
93 90 //儿童听筛记录
94 91 BabyPatientExtendEarScreenQuery earScreenQuery = new BabyPatientExtendEarScreenQuery();
95   - earScreenQuery.setBabyId(babyId);
  92 + earScreenQuery.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()]));
96 93 earScreenQuery.setSort("screen_date");
97 94 List<BabyPatientExtendEarScreen> earScreenList = screenService.queryBabyPatientExtendEarScreen(earScreenQuery);
98 95  
99 96 //儿童听力诊断记录
100 97 BabyPatientExtendEarHearingDiagnoseQuery hearingDiagnoseQuery = new BabyPatientExtendEarHearingDiagnoseQuery();
101   - hearingDiagnoseQuery.setBabyId(babyId);
  98 + hearingDiagnoseQuery.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()]));
102 99 hearingDiagnoseQuery.setIfdel(0);
103 100 hearingDiagnoseQuery.setSort("diagnose_time");
104 101 List<BabyPatientExtendEarHearingDiagnose> hearingDiagnoseList = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnose(hearingDiagnoseQuery);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 9abb814
... ... @@ -2376,8 +2376,6 @@
2376 2376  
2377 2377 if (StringUtils.isNotEmpty(cardNo)) ;
2378 2378 {
2379   -
2380   -
2381 2379 BabyModelQuery babyQuery = new BabyModelQuery();
2382 2380 //去掉yn为1的，程序去处理优化查询
2383 2381 // babyQuery.setYn(YnEnums.YES.getId());
... ... @@ -2412,7 +2410,6 @@
2412 2410 result.setMalformation(babyModel.getMalformation());
2413 2411 result.setApgarScore(JsonUtil.str2Obj(babyModel.getApgarScore(), Map.class));
2414 2412 result.setmHighRiskReason(babyModel.getmHighRiskReason());
2415   -
2416 2413  
2417 2414 result.setFatherProfessionTypeId(babyModel.getFproTypeId());
2418 2415 } else {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java View file @ 9abb814
... ... @@ -98,7 +98,6 @@
98 98 private BabyPatientExtendEarBabyService earBabyService;
99 99  
100 100  
101   -
102 101 //处理儿童person信息
103 102 private PersonModel handBabyPerson(BabyModel baby) {
104 103 //跟距母親的證件號查詢兒童person信息
105 104  
... ... @@ -181,7 +180,40 @@
181 180 // childrenRecordService.addChildrenRecord(childrenRecord);
182 181 }*/
183 182  
  183 + /**
  184 + * 根据babyid和医院Id获取babyIds
  185 + * @param babyId
  186 + * @param hospitalId
  187 + * @return
  188 + */
  189 + public List<String> getBabyIdsByItemOrg(String babyId, String hospitalId) {
  190 + List<String> babyIds = new ArrayList<>();
  191 + babyIds.add(babyId);
  192 + //机构内的医院集合
  193 + List<String> hospitIds = getOrgHospitalIds(hospitalId);
  194 + BabyPatientExtendEarBabyQuery extendEarBabyQuery = new BabyPatientExtendEarBabyQuery();
  195 + extendEarBabyQuery.setBabyPatientId(babyId);
  196 + //根据babyId查询是否存
  197 + BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery();
  198 + earQuery.setBabyPatientId(babyId);
  199 + List<BabyPatientExtendEar> babyPatientExtendEars = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery);
  200 + if (CollectionUtils.isNotEmpty(babyPatientExtendEars)) {
  201 + BabyPatientExtendEar babyPatientExtendEar = babyPatientExtendEars.get(0);
  202 + String personId = babyPatientExtendEar.getPersonId();
  203 + earQuery = new BabyPatientExtendEarQuery();
  204 + earQuery.setPersonId(personId);
  205 + earQuery.setCreateHospitalIds((String[]) hospitIds.toArray(new String[hospitIds.size()]));
184 206  
  207 + List<BabyPatientExtendEar> babyPatientExtendEars1 = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery);
  208 + if (CollectionUtils.isNotEmpty(babyPatientExtendEars1)) {
  209 + for(BabyPatientExtendEar ear:babyPatientExtendEars1){
  210 + babyIds.add(ear.getBabyPatientId());
  211 + }
  212 + }
  213 + }
  214 + return babyIds;
  215 + }
  216 +
185 217 /**
186 218 * 显示儿童隐藏建档
187 219 *
... ... @@ -225,7 +257,7 @@
225 257 */
226 258 public boolean addhideBabyEar(String babyId, String hospitalId) {
227 259  
228   - if(StringUtils.isEmpty(babyId)||StringUtils.isEmpty(hospitalId)){
  260 + if (StringUtils.isEmpty(babyId) || StringUtils.isEmpty(hospitalId)) {
229 261 return false;
230 262 }
231 263  
232 264  
... ... @@ -423,11 +455,11 @@
423 455 extendEarBabyQuery.setBabyPatientId(babyPatientId);
424 456 List<BabyPatientExtendEarBaby> babyPatientExtendEarBabies = babyPatientExtendEarBabyService.queryBabyPatientExtendEarBaby(extendEarBabyQuery);
425 457  
426   - if(CollectionUtils.isNotEmpty(babyPatientExtendEarBabies)){
  458 + if (CollectionUtils.isNotEmpty(babyPatientExtendEarBabies)) {
427 459 BabyPatientExtendEarBaby earBaby = babyPatientExtendEarBabies.get(0);
428 460 babyPatientExtendEarBaby.setId(earBaby.getId());
429 461 babyPatientExtendEarBabyService.updateBabyPatientExtendEarBaby(babyPatientExtendEarBaby);
430   - }else{
  462 + } else {
431 463 babyPatientExtendEarBaby.setId(UUID.randomUUID().toString().replace("-", ""));
432 464 babyPatientExtendEarBabyService.addBabyPatientExtendEarBaby(babyPatientExtendEarBaby);
433 465 }
... ... @@ -756,7 +788,7 @@
756 788 String hfString = null;
757 789 if (historyStr.toString().endsWith(",")) {
758 790 hfString = historyStr.substring(0, historyStr.length() - 1);
759   - }else{
  791 + } else {
760 792 hfString = historyStr.toString();
761 793 }
762 794 babyEarFamilyView.setBadLifeHistory(hfString);
... ... @@ -1595,7 +1627,7 @@
1595 1627 babyPatientExtendEarScreenService.addBabyPatientExtendEarScreen(babyPatientExtendEarScreen);
1596 1628 //听力筛查-当某个儿童在同一院组内某家医院完成了的听筛建档后去院组内其他医院做了听筛、听诊或随访，应该要在对应的医院下创建一个隐藏档案
1597 1629 //建立隐藏档案
1598   - addhideBabyEar(babyPatientExtendEarScreen.getBabyId(),hId);
  1630 + addhideBabyEar(babyPatientExtendEarScreen.getBabyId(), hId);
1599 1631 } else {
1600 1632 babyPatientExtendEarScreen.setLastUpdateDate(new Date());
1601 1633 babyPatientExtendEarScreen.setLastUpdateUserId(userId + "");