diff --git a/src/main/java/com/docus/server/collection/mapper/TBasicMapper.java b/src/main/java/com/docus/server/collection/mapper/TBasicMapper.java
index ace698c..fd1f1fb 100644
--- a/src/main/java/com/docus/server/collection/mapper/TBasicMapper.java
+++ b/src/main/java/com/docus/server/collection/mapper/TBasicMapper.java
@@ -3,6 +3,7 @@ package com.docus.server.collection.mapper;
 
 import com.docus.server.collection.entity.TBasic;
 import com.docus.server.collection.entity.TBasicExtend;
+import com.docus.server.report.entity.MaternalInfantRelationship;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -74,18 +75,19 @@ public interface TBasicMapper{
     String getSdRyIndex(@Param("patientId") String patientId);
 
     /**
-     * 根据宝宝的患者索引 查询母亲的患者索引
+     * 根据宝宝的患者索引 关联数据
      * @param babyIndex 宝宝患者索引
-     * @return 母亲的患者索引
+     * @return 关联数据
      */
-    String getParentSdRyIndex(@Param("babyIndex")String babyIndex);
+    MaternalInfantRelationship getMaternalInfantRelationship(@Param("babyIndex")String babyIndex);
 
     /**
      * 根据患者索引，查询病案主键
      * @param sdRyIndex 患者索引
+     * @param admissTimes 住院次数
      * @return 病案主键
      */
-    String getPatientIdBySdRyIndex(@Param("sdRyIndex")String sdRyIndex);
+    String getPatientIdBySdRyIndexAndAdmissTimes(@Param("sdRyIndex")String sdRyIndex, @Param("admissTimes") String admissTimes );
 
     /**
      * 根据病案主键查询基础信息
diff --git a/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java b/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java
index a3dcd00..fe2b1cd 100644
--- a/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java
+++ b/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java
@@ -1,7 +1,6 @@
 package com.docus.server.collection.service.impl;
 
 import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.docus.core.util.DateUtil;
 import com.docus.core.util.Func;
 import com.docus.infrastructure.core.exception.BaseException;
@@ -11,6 +10,7 @@ import com.docus.server.collection.entity.TBasic;
 import com.docus.server.collection.entity.TBasicExtend;
 import com.docus.server.collection.mapper.TBasicMapper;
 import com.docus.server.collection.service.ITBasicService;
+import com.docus.server.report.entity.MaternalInfantRelationship;
 import com.docus.server.rpc.SdRyHospitalRpc;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -18,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Date;
+import java.util.Objects;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
@@ -50,51 +51,51 @@ public class TBasicServiceImpl implements ITBasicService {
     public void setTBasic(TBasicDto tBasicDto) throws Exception {
         //判断jzh是否重复
         Integer num = tBasicMapper.selectOne(tBasicDto.getJzh());
-        if (num>0) {
+        if (num > 0) {
             updateTBasic(tBasicDto);
             return;
         }
         Long patientId = idService.getDateSeq();
 
         //数据类型转化，格式处理
-        Date admissDate=null;
-        if(Func.isNotEmpty(tBasicDto.getAdmissDate())){
+        Date admissDate = null;
+        if (Func.isNotEmpty(tBasicDto.getAdmissDate())) {
             admissDate = Func.parseDate(tBasicDto.getAdmissDate(), DateUtil.PATTERN_DATETIME_MINI);
         }
-        Date disDate=null;
-        if(Func.isNotEmpty(tBasicDto.getDisDate())){
+        Date disDate = null;
+        if (Func.isNotEmpty(tBasicDto.getDisDate())) {
             disDate = Func.parseDate(tBasicDto.getDisDate(), DateUtil.PATTERN_DATETIME_MINI);
         }
         String admissTimesStr = tBasicDto.getAdmissTimes();
-        Integer admissTimes=null;
-        if(NumberUtil.isInteger(admissTimesStr)){
-            admissTimes=Integer.parseInt(admissTimesStr);
+        Integer admissTimes = null;
+        if (NumberUtil.isInteger(admissTimesStr)) {
+            admissTimes = Integer.parseInt(admissTimesStr);
         }
         String ageStr = tBasicDto.getAge();
-        if(Func.isNotEmpty(ageStr)){
-            ageStr =ageStr.substring(0,ageStr.length()-1);
+        if (Func.isNotEmpty(ageStr)) {
+            ageStr = ageStr.substring(0, ageStr.length() - 1);
         }
-        Integer age=null;
-        if(NumberUtil.isInteger(ageStr)){
-            age=Integer.parseInt(ageStr);
+        Integer age = null;
+        if (NumberUtil.isInteger(ageStr)) {
+            age = Integer.parseInt(ageStr);
         }
-        String sexName=tBasicDto.getSexName();
-        if(Func.isNotEmpty(sexName)&&sexName.length()>1){
-            sexName=sexName.substring(0,1);
+        String sexName = tBasicDto.getSexName();
+        if (Func.isNotEmpty(sexName) && sexName.length() > 1) {
+            sexName = sexName.substring(0, 1);
         }
         String admissDaysStr = tBasicDto.getAdmissDays();
-        Integer admissDays=null;
-        if(NumberUtil.isInteger(admissDaysStr)){
-            admissDays=Integer.parseInt(admissDaysStr);
+        Integer admissDays = null;
+        if (NumberUtil.isInteger(admissDaysStr)) {
+            admissDays = Integer.parseInt(admissDaysStr);
         }
         String isDeadStr = tBasicDto.getIsDead();
-        Integer isDead=0;
-        if("死亡".equals(isDeadStr)){
-            isDead=1;
+        Integer isDead = 0;
+        if ("死亡".equals(isDeadStr)) {
+            isDead = 1;
         }
 
         //组装数据
-        TBasic tBasic=new TBasic();
+        TBasic tBasic = new TBasic();
         tBasic.setPatientId(patientId.toString());
         tBasic.setJzh(tBasicDto.getJzh());
         tBasic.setInpatientNo(tBasicDto.getInpatientNo());
@@ -120,22 +121,21 @@ public class TBasicServiceImpl implements ITBasicService {
 
         //设置是否婴儿
         String inpatientNo = tBasicDto.getInpatientNo();
-        if(inpatientNo.contains("B")||inpatientNo.contains("b")){
+        if (inpatientNo.contains("B") || inpatientNo.contains("b")) {
             tBasic.setIsOther(1);
-        }else{
+        } else {
             tBasic.setIsOther(0);
         }
-
-        TBasicExtend tBasicExtend=new TBasicExtend();
+        String sdryIndex = tBasicDto.getSdryIndex();
+        TBasicExtend tBasicExtend = new TBasicExtend();
         tBasicExtend.setPatientId(patientId.toString());
         tBasicExtend.setWardCode(tBasicDto.getWardCode());
         tBasicExtend.setWardName(tBasicDto.getWardName());
-        tBasicExtend.setSdryIndex(tBasicDto.getSdryIndex());
-
+        tBasicExtend.setSdryIndex(sdryIndex == null ? null : sdryIndex.replace("z", "").replace("m", ""));
         //持久化
         tBasicMapper.insert(tBasic);
         tBasicMapper.insertExtend(tBasicExtend);
-        confirmAndUpdIcuRecordState(tBasic.getInpatientNo(),tBasic.getAdmissTimes());
+        confirmAndUpdIcuRecordState(tBasic.getInpatientNo(), tBasic.getAdmissTimes());
     }
 
 
@@ -149,44 +149,44 @@ public class TBasicServiceImpl implements ITBasicService {
             return;
         }
         //数据类型转化，格式处理
-        Date admissDate=null;
-        if(Func.isNotEmpty(tBasicDto.getAdmissDate())){
+        Date admissDate = null;
+        if (Func.isNotEmpty(tBasicDto.getAdmissDate())) {
             admissDate = Func.parseDate(tBasicDto.getAdmissDate(), DateUtil.PATTERN_DATETIME_MINI);
         }
-        Date disDate=null;
-        if(Func.isNotEmpty(tBasicDto.getDisDate())){
+        Date disDate = null;
+        if (Func.isNotEmpty(tBasicDto.getDisDate())) {
             disDate = Func.parseDate(tBasicDto.getDisDate(), DateUtil.PATTERN_DATETIME_MINI);
         }
         String admissTimesStr = tBasicDto.getAdmissTimes();
-        Integer admissTimes=null;
-        if(NumberUtil.isInteger(admissTimesStr)){
-            admissTimes=Integer.parseInt(admissTimesStr);
+        Integer admissTimes = null;
+        if (NumberUtil.isInteger(admissTimesStr)) {
+            admissTimes = Integer.parseInt(admissTimesStr);
         }
         String ageStr = tBasicDto.getAge();
-        if(Func.isNotEmpty(ageStr)){
-            ageStr =ageStr.substring(0,ageStr.length()-1);
+        if (Func.isNotEmpty(ageStr)) {
+            ageStr = ageStr.substring(0, ageStr.length() - 1);
         }
-        Integer age=null;
-        if(NumberUtil.isInteger(ageStr)){
-            age=Integer.parseInt(ageStr);
+        Integer age = null;
+        if (NumberUtil.isInteger(ageStr)) {
+            age = Integer.parseInt(ageStr);
         }
-        String sexName=tBasicDto.getSexName();
-        if(Func.isNotEmpty(sexName)&&sexName.length()>1){
-            sexName=sexName.substring(0,1);
+        String sexName = tBasicDto.getSexName();
+        if (Func.isNotEmpty(sexName) && sexName.length() > 1) {
+            sexName = sexName.substring(0, 1);
         }
         String admissDaysStr = tBasicDto.getAdmissDays();
-        Integer admissDays=null;
-        if(NumberUtil.isInteger(admissDaysStr)){
-            admissDays=Integer.parseInt(admissDaysStr);
+        Integer admissDays = null;
+        if (NumberUtil.isInteger(admissDaysStr)) {
+            admissDays = Integer.parseInt(admissDaysStr);
         }
         String isDeadStr = tBasicDto.getIsDead();
-        Integer isDead=0;
-        if("死亡".equals(isDeadStr)){
-            isDead=1;
+        Integer isDead = 0;
+        if ("死亡".equals(isDeadStr)) {
+            isDead = 1;
         }
 
         //组装数据
-        TBasic tBasic=new TBasic();
+        TBasic tBasic = new TBasic();
 
         tBasic.setJzh(tBasicDto.getJzh());
         tBasic.setPatientId(patientId);
@@ -213,13 +213,13 @@ public class TBasicServiceImpl implements ITBasicService {
         tBasic.setIsOther(tBasicDto.getIsOther());
         //设置是否婴儿
         String inpatientNo = tBasicDto.getInpatientNo();
-        if(tBasic.getIsOther()==0&&(inpatientNo.contains("B")||inpatientNo.contains("b"))){
+        if (tBasic.getIsOther() == 0 && (inpatientNo.contains("B") || inpatientNo.contains("b"))) {
             tBasic.setIsOther(1);
-        }else if(tBasic.getIsOther()==0){
+        } else if (tBasic.getIsOther() == 0) {
             tBasic.setIsOther(0);
         }
         //是否取消住院
-        if("2".equals(tBasicDto.getStatu())){
+        if ("2".equals(tBasicDto.getStatu())) {
             tBasic.setDisDate(null);
         }
         String sdryIndex = tBasicDto.getSdryIndex();
@@ -227,12 +227,12 @@ public class TBasicServiceImpl implements ITBasicService {
         tBasicExtend.setPatientId(patientId);
         tBasicExtend.setWardCode(tBasicDto.getWardCode());
         tBasicExtend.setWardName(tBasicDto.getWardName());
-        tBasicExtend.setSdryIndex(sdryIndex == null ? null : sdryIndex.replace("z", "").replace("m",""));
+        tBasicExtend.setSdryIndex(sdryIndex == null ? null : sdryIndex.replace("z", "").replace("m", ""));
 
         //持久化
         tBasicMapper.update(tBasic);
         tBasicMapper.updateExtend(tBasicExtend);
-        confirmAndUpdIcuRecordState(tBasic.getInpatientNo(),tBasic.getAdmissTimes());
+        confirmAndUpdIcuRecordState(tBasic.getInpatientNo(), tBasic.getAdmissTimes());
     }
 
     @Override
@@ -243,50 +243,50 @@ public class TBasicServiceImpl implements ITBasicService {
         if (Func.isEmpty(patientId)) {
             throw new BaseException("数据不存在，更新失败");
         }
-        if("2".equals(tBasicDto.getStatu())){
+        if ("2".equals(tBasicDto.getStatu())) {
             tBasicMapper.deleteByPatientId(patientId);
-            log.info("入院信息删除jzh:{},patientId:{},statusCode:{}",tBasicDto.getJzh(),patientId,tBasicDto.getStatu());
+            log.info("入院信息删除jzh:{},patientId:{},statusCode:{}", tBasicDto.getJzh(), patientId, tBasicDto.getStatu());
             return;
         }
         //数据类型转化，格式处理
-        Date admissDate=null;
-        if(Func.isNotEmpty(tBasicDto.getAdmissDate())){
+        Date admissDate = null;
+        if (Func.isNotEmpty(tBasicDto.getAdmissDate())) {
             admissDate = Func.parseDate(tBasicDto.getAdmissDate(), DateUtil.PATTERN_DATETIME_MINI);
         }
-        Date disDate=null;
-        if(Func.isNotEmpty(tBasicDto.getDisDate())){
+        Date disDate = null;
+        if (Func.isNotEmpty(tBasicDto.getDisDate())) {
             disDate = Func.parseDate(tBasicDto.getDisDate(), DateUtil.PATTERN_DATETIME_MINI);
         }
         String admissTimesStr = tBasicDto.getAdmissTimes();
-        Integer admissTimes=null;
-        if(NumberUtil.isInteger(admissTimesStr)){
-            admissTimes=Integer.parseInt(admissTimesStr);
+        Integer admissTimes = null;
+        if (NumberUtil.isInteger(admissTimesStr)) {
+            admissTimes = Integer.parseInt(admissTimesStr);
         }
         String ageStr = tBasicDto.getAge();
-        if(Func.isNotEmpty(ageStr)){
-            ageStr =ageStr.substring(0,ageStr.length()-1);
+        if (Func.isNotEmpty(ageStr)) {
+            ageStr = ageStr.substring(0, ageStr.length() - 1);
         }
-        Integer age=null;
-        if(NumberUtil.isInteger(ageStr)){
-            age=Integer.parseInt(ageStr);
+        Integer age = null;
+        if (NumberUtil.isInteger(ageStr)) {
+            age = Integer.parseInt(ageStr);
         }
-        String sexName=tBasicDto.getSexName();
-        if(Func.isNotEmpty(sexName)&&sexName.length()>1){
-            sexName=sexName.substring(0,1);
+        String sexName = tBasicDto.getSexName();
+        if (Func.isNotEmpty(sexName) && sexName.length() > 1) {
+            sexName = sexName.substring(0, 1);
         }
         String admissDaysStr = tBasicDto.getAdmissDays();
-        Integer admissDays=null;
-        if(NumberUtil.isInteger(admissDaysStr)){
-            admissDays=Integer.parseInt(admissDaysStr);
+        Integer admissDays = null;
+        if (NumberUtil.isInteger(admissDaysStr)) {
+            admissDays = Integer.parseInt(admissDaysStr);
         }
         String isDeadStr = tBasicDto.getIsDead();
-        Integer isDead=0;
-        if("死亡".equals(isDeadStr)){
-            isDead=1;
+        Integer isDead = 0;
+        if ("死亡".equals(isDeadStr)) {
+            isDead = 1;
         }
 
         //组装数据
-        TBasic tBasic=new TBasic();
+        TBasic tBasic = new TBasic();
 
         tBasic.setJzh(tBasicDto.getJzh());
         tBasic.setPatientId(patientId);
@@ -313,40 +313,42 @@ public class TBasicServiceImpl implements ITBasicService {
         tBasic.setIsOther(tBasicDto.getIsOther());
         //设置是否婴儿
         String inpatientNo = tBasicDto.getInpatientNo();
-        if(tBasic.getIsOther()==0&&(inpatientNo.contains("B")||inpatientNo.contains("b"))){
+        if (tBasic.getIsOther() == 0 && (inpatientNo.contains("B") || inpatientNo.contains("b"))) {
             tBasic.setIsOther(1);
-        }else if(tBasic.getIsOther()==0){
+        } else if (tBasic.getIsOther() == 0) {
             tBasic.setIsOther(0);
         }
         String sdryIndex = tBasicDto.getSdryIndex();
-        TBasicExtend tBasicExtend=new TBasicExtend();
+        TBasicExtend tBasicExtend = new TBasicExtend();
         tBasicExtend.setPatientId(patientId);
         tBasicExtend.setWardCode(tBasicDto.getWardCode());
         tBasicExtend.setWardName(tBasicDto.getWardName());
-        tBasicExtend.setSdryIndex(sdryIndex==null?null:sdryIndex.replace("z","").replace("m",""));
+        tBasicExtend.setSdryIndex(sdryIndex == null ? null : sdryIndex.replace("z", "").replace("m", ""));
 
         //持久化
         tBasicMapper.update(tBasic);
         tBasicMapper.updateExtend(tBasicExtend);
-        confirmAndUpdIcuRecordState(tBasic.getInpatientNo(),tBasic.getAdmissTimes());
+        confirmAndUpdIcuRecordState(tBasic.getInpatientNo(), tBasic.getAdmissTimes());
     }
 
 
     @Override
     public TBasic getSdRyParentPatientInfo(String babyPatientId) {
         // 宝宝索引
-        String babyIndex=tBasicMapper.getSdRyIndex(babyPatientId);
-        if (Func.isBlank(babyIndex)){
+        String babyIndex = tBasicMapper.getSdRyIndex(babyPatientId);
+        if (Func.isBlank(babyIndex)) {
             return null;
         }
-        // 宝宝索引查妈妈索引
-        String parentSdRyIndex= tBasicMapper.getParentSdRyIndex(babyIndex);
-        if(Func.isBlank(parentSdRyIndex)){
+        // 宝宝索引查妈妈索引 和住院次数
+        MaternalInfantRelationship infantRelationship = tBasicMapper.getMaternalInfantRelationship(babyIndex);
+
+        if (Objects.isNull(infantRelationship) || Func.isBlank(infantRelationship.getMomId()) ) {
             return null;
         }
-        // 通过索引查病案主键
-        String parentPatientId=tBasicMapper.getPatientIdBySdRyIndex(parentSdRyIndex);
-        if(Func.isBlank(parentPatientId)){
+        String parentSdRyIndex=infantRelationship.getMomId();
+        // 通过索引和住院次数查病案主键
+        String parentPatientId = tBasicMapper.getPatientIdBySdRyIndexAndAdmissTimes(parentSdRyIndex,infantRelationship.getParentTimes());
+        if (Func.isBlank(parentPatientId)) {
             return null;
         }
         // 通过病案主键查基础信息
@@ -355,20 +357,20 @@ public class TBasicServiceImpl implements ITBasicService {
 
     @Override
     public boolean getIsBabyBasic(String patientId) {
-        TBasic tBasic= tBasicMapper.getByPatientId(patientId);
+        TBasic tBasic = tBasicMapper.getByPatientId(patientId);
         return Func.isNotEmpty(tBasic) && Func.isNotBlank(tBasic.getInpatientNo()) && tBasic.getInpatientNo().toUpperCase().contains("B");
     }
 
 
-    public void confirmAndUpdIcuRecordState(String inpatientNo,Integer admissTimes){
-        threadPoolExecutor.execute(()->{
+    public void confirmAndUpdIcuRecordState(String inpatientNo, Integer admissTimes) {
+        threadPoolExecutor.execute(() -> {
             // 此处异步，睡眠一秒保证事务提交
             try {
                 TimeUnit.SECONDS.sleep(1);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-            sdRyHospitalRpc.confirmAndUpdIcuRecordState(inpatientNo,admissTimes);
+            sdRyHospitalRpc.confirmAndUpdIcuRecordState(inpatientNo, admissTimes);
         });
     }
 }
diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml
index 1d6608a..7fa29e4 100644
--- a/src/main/resources/mapper/TBasicMapper.xml
+++ b/src/main/resources/mapper/TBasicMapper.xml
@@ -204,15 +204,17 @@
         from `docus_medicalrecord`.`t_basic_extend`
         WHERE patient_id=#{patientId}
     </select>
-    <select id="getParentSdRyIndex" resultType="java.lang.String">
-        SELECT mom_id
+    <select id="getMaternalInfantRelationship" resultType="com.docus.server.report.entity.MaternalInfantRelationship">
+        SELECT *
         FROM `docus_medicalrecord`.`t_maternal_infant_relationship`
         where baby_id=#{babyIndex}
     </select>
-    <select id="getPatientIdBySdRyIndex" resultType="java.lang.String">
-        select patient_id
+    <select id="getPatientIdBySdRyIndexAndAdmissTimes" resultType="java.lang.String">
+        select t_basic_extend.patient_id
         from `docus_medicalrecord`.`t_basic_extend`
-        WHERE sdry_index=#{sdRyIndex}
+                 INNER JOIN docus_medicalrecord.t_basic ON t_basic_extend.patient_id = t_basic.patient_id
+        WHERE t_basic_extend.sdry_index = #{sdRyIndex}
+          and t_basic.admiss_times = #{admissTimes}
     </select>
     <select id="getByPatientId" resultType="com.docus.server.collection.entity.TBasic">
         select *