jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ba3c8e1e881a2b766bf84c313d6022d6f3bd9d2d

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

听力诊断模块

Showing 5 changed files with 28 additions and 8 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java View file @ ba3c8e1
... ... @@ -4,13 +4,12 @@
4 4 import com.lyms.platform.common.dao.BaseQuery;
5 5  
6 6 import java.util.Date;
7   -import java.util.List;
8 7  
9 8  
10 9 public class BabyPatientExtendEarScreenQuery extends BaseQuery {
11 10 private String id;
12 11 //听诊儿童档案集合
13   - private List<String> babyIds;
  12 + private String[] babyIds;
14 13  
15 14 private String babyId;
16 15  
17 16  
... ... @@ -285,11 +284,11 @@
285 284 this.screenEndDate = screenEndDate;
286 285 }
287 286  
288   - public List<String> getBabyIds() {
  287 + public String[] getBabyIds() {
289 288 return babyIds;
290 289 }
291 290  
292   - public void setBabyIds(List<String> babyIds) {
  291 + public void setBabyIds(String[] babyIds) {
293 292 this.babyIds = babyIds;
294 293 }
295 294  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java View file @ ba3c8e1
... ... @@ -244,7 +244,7 @@
244 244 query.setIfdel(0);
245 245  
246 246 //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
247   - if (fur.getKeyWord() != null) {//关键字：姓名、联系方式、就诊卡 查询babyId
  247 + if (StringUtils.isNotEmpty(fur.getKeyWord())) {//关键字：姓名、联系方式、就诊卡 查询babyId
248 248 BabyModelQuery babyQuery = new BabyModelQuery();
249 249 babyQuery.setQueryNo(fur.getKeyWord());
250 250 //查询建档记录
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java View file @ ba3c8e1
... ... @@ -468,7 +468,7 @@
468 468 for (Patients pa : patientses) {
469 469 babyIds.add(pa.getId());
470 470 }
471   - screenQuery.setBabyIds(babyIds);
  471 + screenQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
472 472 } else if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getKeyWord())) {
473 473 return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
474 474 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java View file @ ba3c8e1
... ... @@ -353,7 +353,7 @@
353 353 }
354 354 BabyPatientExtendEarScreenQuery scrQuery = new BabyPatientExtendEarScreenQuery();
355 355 //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
356   - if (hdReq.getKeyWord() != null) {//关键字：姓名、联系方式、就诊卡 查询babyId
  356 + if (StringUtils.isNotEmpty(hdReq.getKeyWord())) {//关键字：姓名、联系方式、就诊卡 查询babyId
357 357 BabyModelQuery babyQuery = new BabyModelQuery();
358 358 babyQuery.setQueryNo(hdReq.getKeyWord());
359 359 //查询建档记录
... ... @@ -363,7 +363,7 @@
363 363 for(BabyModel babyModel:models){
364 364 babyIds.add(babyModel.getId());
365 365 }
366   - scrQuery.setBabyIds(babyIds);
  366 + scrQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
367 367 }else{
368 368 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据");
369 369 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java View file @ ba3c8e1
1 1 package com.lyms.platform.operate.web.facade;
2 2  
3 3 import com.alibaba.fastjson.JSONObject;
  4 +import com.lyms.platform.biz.service.BabyBookbuildingService;
4 5 import com.lyms.platform.biz.service.BabyService;
5 6 import com.lyms.platform.biz.service.BasicConfigService;
6 7 import com.lyms.platform.biz.service.PersonService;
... ... @@ -94,6 +95,8 @@
94 95 private AntenatalExaminationFacade examinationFacade;
95 96 @Autowired
96 97 private OrganizationGroupsFacade groupsFacade;
  98 + @Autowired
  99 + private BabyBookbuildingService babyBookbuildingService;
97 100  
98 101 //处理儿童person信息
99 102 private PersonModel handBabyPerson(BabyModel baby) {
... ... @@ -1533,6 +1536,24 @@
1533 1536 List hospitalIds = getOrgHospitalIds(hospitalId);
1534 1537 String[] checkHospitalIds = (String[])hospitalIds.toArray(new String[hospitalIds.size()]);
1535 1538 screenQuery.setCheckHospitalIds(checkHospitalIds);
  1539 +
  1540 + //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
  1541 + if (StringUtils.isNotEmpty(earScreenListRequest.getKeyWord())) {//关键字：姓名、联系方式、就诊卡 查询babyId
  1542 + BabyModelQuery babyQuery = new BabyModelQuery();
  1543 + babyQuery.setQueryNo(earScreenListRequest.getKeyWord());
  1544 + //查询建档记录
  1545 + List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
  1546 + if(CollectionUtils.isNotEmpty(models)){
  1547 + List<String> babyIds = new ArrayList<>();
  1548 + for(BabyModel babyModel:models){
  1549 + babyIds.add(babyModel.getId());
  1550 + }
  1551 + screenQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
  1552 + }else{
  1553 + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据");
  1554 + }
  1555 + }
  1556 +
1536 1557  
1537 1558 List<BabyPatientExtendEarScreen> babyPatientExtendEarScreens = babyPatientExtendEarScreenService.queryEarScreenList(screenQuery);
1538 1559 List<EarScreenResult> earScreenResults = new ArrayList<>();