Merge remote-tracking branch 'origin/main'

This commit is contained in:
Flow 2025-06-27 16:18:10 +08:00
commit 418be095df
3 changed files with 34 additions and 3 deletions

View File

@ -547,7 +547,7 @@ public class InspectPatientController {
@Operation(summary = "获取检验报告")
public CommonResult<Boolean> getReportTj(@RequestParam("medicalSn") String medicalSn, @RequestParam("type") String type) {
//获取患者信息
InspectPatientDO patientDO = patientService.getPatientInfo(medicalSn);
InspectPatientDO patientDO = patientService.getnewPatientInfo(medicalSn);
if (patientDO != null) {
String model = "";

View File

@ -82,6 +82,10 @@ public interface InspectPatientService {
* 根据体检编号获取患者信息的json
* */
InspectPatientDO getPatientInfo(String medicalSn);
/*
* 根据体检编号获取患者信息 不包含头像
* */
InspectPatientDO getnewPatientInfo(String medicalSn);
/*
* 根据体检编号获取患者信息除头像外

View File

@ -174,6 +174,33 @@ public class InspectPatientServiceImpl implements InspectPatientService {
return patientDO;
}
@Override
public InspectPatientDO getnewPatientInfo(String medicalSn)
{
LambdaQueryWrapper<InspectPatientDO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.select(
InspectPatientDO::getMedicalSn,
InspectPatientDO::getGender,
InspectPatientDO::getPName,
InspectPatientDO::getCardId,
InspectPatientDO::getHospitalNo,
InspectPatientDO::getOrgname,
InspectPatientDO::getDistrictname,
InspectPatientDO::getOldmanflag,
InspectPatientDO::getHtnflag,
InspectPatientDO::getDiaflag,
InspectPatientDO::getSmiflag,
InspectPatientDO::getPulflag,
InspectPatientDO::getXcgcode,
InspectPatientDO::getNcgcode,
InspectPatientDO::getShqx,
InspectPatientDO::getMedicalDateTime
);
queryWrapper.eq(InspectPatientDO::getMedicalSn, medicalSn);
InspectPatientDO patientDO = patientMapper.selectOne(queryWrapper);
return patientDO;
}
@Override
public InspectPatientDO getPatientShortid(String medicalSn) {