Commit ca75c67cf38c659f139a29566f80395ec95a794d

Authored by yangfei
1 parent bbadac7f58

听力诊断模块

Showing 1 changed file with 9 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java View file @ ca75c67
... ... @@ -16,12 +16,8 @@
16 16 import com.lyms.platform.operate.web.result.HighriskChangeHospitalOneResult;
17 17 import com.lyms.platform.operate.web.utils.ResponseUtil;
18 18 import com.lyms.platform.permission.model.*;
19   -import com.lyms.platform.permission.service.BabyPatientExtendEarScreenService;
20   -import com.lyms.platform.permission.service.HighriskChangeHospitalService;
21   -import com.lyms.platform.permission.service.OrganizationService;
22   -import com.lyms.platform.permission.service.UsersService;
  19 +import com.lyms.platform.permission.service.*;
23 20 import com.lyms.platform.pojo.BabyModel;
24   -import com.lyms.platform.query.BabyModelQuery;
25 21 import org.apache.commons.collections.CollectionUtils;
26 22 import org.apache.commons.lang.StringUtils;
27 23 import org.springframework.beans.factory.annotation.Autowired;
28 24  
... ... @@ -62,8 +58,9 @@
62 58 private BabyBookbuildingService babyBookbuildingService;
63 59 @Autowired
64 60 private BabyEarFacade babyEarFacade;
  61 + @Autowired
  62 + private BabyPatientExtendEarBabyService earBabyService;
65 63  
66   -
67 64 /**
68 65 * 导出听力转诊列表
69 66 *
70 67  
71 68  
72 69  
... ... @@ -336,14 +333,16 @@
336 333  
337 334 //如果查询号不为空,根据查询号查询儿童档案表,获取儿童档案Id
338 335 if (query.getQueryNo() != null) {//关键字:姓名、联系方式、就诊卡 查询babyId
339   - BabyModelQuery babyQuery = new BabyModelQuery();
  336 + BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery();
340 337 babyQuery.setQueryNo(query.getQueryNo());
  338 + babyQuery.setHospitalId(hospitalId);
  339 + List<BabyPatientExtendEarBaby> models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery);
  340 +
341 341 //查询建档记录
342   - List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
343 342 if (CollectionUtils.isNotEmpty(models)) {
344 343 List<String> babyIds = new ArrayList<>();
345   - for (BabyModel babyModel : models) {
346   - babyIds.add(babyModel.getId());
  344 + for (BabyPatientExtendEarBaby babyModel : models) {
  345 + babyIds.add(babyModel.getBabyPatientId());
347 346 }
348 347 query.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
349 348 } else {