diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java index 0320d8b..e308a01 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java @@ -23,6 +23,15 @@ public class AntExQuery extends BaseQuery implements IConvertToNativeQuery { private Date start; private Date end; + private String hospitalId; + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } public Date getEnd() { return end; @@ -54,6 +63,9 @@ public class AntExQuery extends BaseQuery implements IConvertToNativeQuery { if(null!=parentId){ condition= condition.and("parentId",parentId, MongoOper.IS); } + if(null!=hospitalId){ + condition= condition.and("hospitalId",hospitalId, MongoOper.IS); + } if(null!=pid){ condition= condition.and("pid",pid, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 86b7bc9..36ce8b4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.facade; +import com.lyms.platform.biz.service.AntenatalExaminationService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.biz.service.SieveService; import com.lyms.platform.common.constants.ErrorCodeConstants; @@ -14,13 +15,16 @@ import com.lyms.platform.operate.web.request.SieveAddRequest; import com.lyms.platform.operate.web.result.SieveDetailResult; import com.lyms.platform.operate.web.result.SieveListResult; import com.lyms.platform.operate.web.result.SieveResult; -import com.lyms.platform.pojo.Patients; -import com.lyms.platform.pojo.SieveModel; -import com.lyms.platform.pojo.SieveResultModel; +import com.lyms.platform.pojo.*; +import com.lyms.platform.query.AntExChuQuery; +import com.lyms.platform.query.AntExQuery; import com.lyms.platform.query.SieveQuery; import com.lyms.platform.query.SieveResultQuery; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -39,7 +43,8 @@ public class SieveFacade { private PatientsService patientsService; @Autowired private AutoMatchFacade autoMatchFacade; - + @Autowired + private AntenatalExaminationService antenatalExaminationService; /** * 增加一条产筛结果记录 @@ -133,13 +138,36 @@ public class SieveFacade { sieveQuery.setPage(cqSieveQueryRequest.getPage()); sieveQuery.setLimit(cqSieveQueryRequest.getLimit()); sieveQuery.setNeed("1"); - sieveQuery.setHospitalId(autoMatchFacade.getHospitalId(userId)); + String hospitalId=autoMatchFacade.getHospitalId(userId); + sieveQuery.setHospitalId(hospitalId); //查询产筛list List list = sieveService.queryList(sieveQuery); List data = new ArrayList<>(); if (CollectionUtils.isNotEmpty(list)) { for (SieveModel sieveModel : list) { SieveListResult sieveListResult = new SieveListResult(); + AntExQuery antExQuery=new AntExQuery(); + antExQuery.setYn(YnEnums.YES.getId()); + antExQuery.setHospitalId(hospitalId); + antExQuery.setParentId(sieveModel.getParentId()); + List list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); + if(CollectionUtils.isNotEmpty(list1)){ + if(StringUtils.isNotEmpty(list1.get(0).getTireNumber())){ + sieveModel.setTireNumber(NumberUtils.toInt(list1.get(0).getTireNumber())); + } + }else{ + AntExChuQuery antExChuQuery=new AntExChuQuery(); + antExChuQuery.setYn(YnEnums.YES.getId()); + antExChuQuery.setParentId(sieveModel.getParentId()); + antExChuQuery.setHospitalId(hospitalId); + List antExChuModels= antenatalExaminationService.queryAntExChu(antExChuQuery); + if(CollectionUtils.isNotEmpty(antExChuModels)){ + if(StringUtils.isNotEmpty(antExChuModels.get(0).getTireNumber())){ + sieveModel.setTireNumber(NumberUtils.toInt(antExChuModels.get(0).getTireNumber())); + } + } + } + sieveListResult.convertToResult(sieveModel); data.add(sieveListResult); }