diff --git a/.idea/artifacts/platform_sync_data_war_exploded.xml b/.idea/artifacts/platform_sync_data_war_exploded.xml index cd8e1d1..449aea2 100644 --- a/.idea/artifacts/platform_sync_data_war_exploded.xml +++ b/.idea/artifacts/platform_sync_data_war_exploded.xml @@ -13,6 +13,7 @@ + @@ -106,7 +107,6 @@ - diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospitalQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospitalQuery.java index d9c8354..4b8e48f 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospitalQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospitalQuery.java @@ -88,6 +88,16 @@ public class HighriskChangeHospitalQuery extends BaseQuery { * 听筛记录ID */ private String scrreenId; + //听诊儿童档案集合 + private String[] babyIds; + + public String[] getBabyIds() { + return babyIds; + } + + public void setBabyIds(String[] babyIds) { + this.babyIds = babyIds; + } public String getQueryNo() { return queryNo; diff --git a/platform-biz-service/src/main/resources/mainOrm/master/HighriskChangeHospital.xml b/platform-biz-service/src/main/resources/mainOrm/master/HighriskChangeHospital.xml index 9f8653d..03cd158 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/HighriskChangeHospital.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/HighriskChangeHospital.xml @@ -111,6 +111,14 @@ select ID,TARGET_TYPE,TARGET_ID,OUT_ORGID,INTO_ORGID,DESCRIPTION,MUSTDESC,RISK,C and TARGET_TYPE = #{targetType,jdbcType=INTEGER} + + and TARGET_ID in ( + + #{bId} + + ) + + and TARGET_ID = #{targetId,jdbcType=VARCHAR} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java index 8a63549..97c3e0e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.platform.biz.service.BabyBookbuildingService; import com.lyms.platform.biz.service.BabyService; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; @@ -20,6 +21,8 @@ import com.lyms.platform.permission.service.HighriskChangeHospitalService; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.BabyModel; +import com.lyms.platform.query.BabyModelQuery; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -52,6 +55,8 @@ public class FollowUpController extends BaseController { private HighriskChangeHospitalService highchangeService; @Autowired private OrganizationService organizationService; + @Autowired + private BabyBookbuildingService babyBookbuildingService; /** @@ -233,9 +238,21 @@ public class FollowUpController extends BaseController { query.setFollowUpEndTime(fur.getFollowUpEndTime()); query.setFollowDoctorId(fur.getFollowDoctorId()); + //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id if (fur.getKeyWord() != null) {//关键字：姓名、联系方式、就诊卡 查询babyId - //调用mysql表查询baby档案。 表还未设计 - // query.setBabyIds(); + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setQueryNo(fur.getKeyWord()); + //查询建档记录 + List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + if(CollectionUtils.isNotEmpty(models)){ + List babyIds = new ArrayList<>(); + for(BabyModel babyModel:models){ + babyIds.add(babyModel.getId()); + } + query.setBabyIds(babyIds.toArray(new String[babyIds.size()])); + }else{ + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); + } } //确诊结果 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java index 8cad016..0b4339c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.platform.biz.service.BabyBookbuildingService; import com.lyms.platform.biz.service.BabyService; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; @@ -17,6 +18,7 @@ import com.lyms.platform.operate.web.utils.MyComparator; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; import com.lyms.platform.pojo.BabyModel; +import com.lyms.platform.query.BabyModelQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -54,6 +56,8 @@ public class HearingDiagnoseController extends BaseController { private BabyPatientExtendEarScreenService screenService; @Autowired private UsersService usersService; + @Autowired + private BabyBookbuildingService babyBookbuildingService; /** * 根据儿童id获取最后一次确诊结果 @@ -254,7 +258,6 @@ public class HearingDiagnoseController extends BaseController { /** * 获取听力诊断记录列表 - * * @param hdReq 听力诊断记录对象 多条件查询 * @param request * @return @@ -313,8 +316,19 @@ public class HearingDiagnoseController extends BaseController { BabyPatientExtendEarScreenQuery scrQuery = new BabyPatientExtendEarScreenQuery(); //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id if (hdReq.getKeyWord() != null) {//关键字：姓名、联系方式、就诊卡 查询babyId - //调用mysql表查询baby档案。 表还未设计 - // scrQuery.setBabyIds(); + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setQueryNo(hdReq.getKeyWord()); + //查询建档记录 + List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + if(CollectionUtils.isNotEmpty(models)){ + List babyIds = new ArrayList<>(); + for(BabyModel babyModel:models){ + babyIds.add(babyModel.getId()); + } + scrQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()])); + }else{ + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); + } } scrQuery.setCheckHospitalIds((String[]) outOrgids.toArray(new String[outOrgids.size()])); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java index e3209ec..61070e7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.platform.biz.service.BabyBookbuildingService; import com.lyms.platform.biz.service.BabyService; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; @@ -19,6 +20,8 @@ import com.lyms.platform.permission.service.HighriskChangeHospitalService; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.BabyModel; +import com.lyms.platform.query.BabyModelQuery; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.eclipse.jetty.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -55,6 +58,8 @@ public class HighriskChangeHospitalController extends BaseController { private UsersService usersService; @Autowired private OrganizationService organizationService; + @Autowired + private BabyBookbuildingService babyBookbuildingService; /** @@ -259,9 +264,6 @@ public class HighriskChangeHospitalController extends BaseController { if (loginState == null) { return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); } - //查询号 queryNo - //查询儿童表 和 母亲表 获取id - //医院id String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); @@ -273,6 +275,24 @@ public class HighriskChangeHospitalController extends BaseController { return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入查询类型"); } query.setNeed("1"); + + //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id + if (query.getQueryNo() != null) {//关键字：姓名、联系方式、就诊卡 查询babyId + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setQueryNo(query.getQueryNo()); + //查询建档记录 + List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + if(CollectionUtils.isNotEmpty(models)){ + List babyIds = new ArrayList<>(); + for(BabyModel babyModel:models){ + babyIds.add(babyModel.getId()); + } + query.setBabyIds(babyIds.toArray(new String[babyIds.size()])); + }else{ + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); + } + } + //医院id List hchList = highriskChangeHospitalService.queryHighriskChangeHospital(query);