母婴关系查询问题修复,新增患者基础数据索引去除m和z

广东省中医_gdszy
wyb 2 years ago
parent 4ac0f2ff4d
commit b8a0f08d38

@ -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 );
/**
*

@ -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;
@ -125,13 +126,12 @@ public class TBasicServiceImpl implements ITBasicService {
} else {
tBasic.setIsOther(0);
}
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);
@ -339,13 +339,15 @@ public class TBasicServiceImpl implements ITBasicService {
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);
String parentSdRyIndex=infantRelationship.getMomId();
// 通过索引和住院次数查病案主键
String parentPatientId = tBasicMapper.getPatientIdBySdRyIndexAndAdmissTimes(parentSdRyIndex,infantRelationship.getParentTimes());
if (Func.isBlank(parentPatientId)) {
return null;
}

@ -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 *

Loading…
Cancel
Save