wangjunping/his
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

up

Browse Source
This commit is contained in:
liuhongrui
2025-03-17 16:46:01 +08:00
parent 73c506b4bf
commit 8c6be970bb
5 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionRecordServiceImpl.java
View File

@@ -66,12 +66,12 @@ public class OutpatientInfusionRecordServiceImpl implements IOutpatientInfusionR
@Autowired
ServiceRequestMapper serviceRequestMapper;
@Override
/**
* 获取门诊输液记录初期数据列表
*
* @return 门诊输液记录初期数据列表
*/
@Override
public OutpatientInfusionInitDto getOutpatientInfusionInit() {
OutpatientInfusionInitDto initDto = new OutpatientInfusionInitDto();

2
openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestRecordServiceImpl.java
View File

@@ -112,7 +112,7 @@ public class OutpatientSkinTestRecordServiceImpl implements IOutpatientSkinTestR
Integer offset = (pageNo - 1) * pageSize;
// 连表查询患者信息
List<OutpatientSkinTestRecordDto> listOutpatientSkinTestRecords =
outpatientManageMapper.getOutpatientSkinTestRecord(outpatientSkinTestRecordSearchParam, pageSize, offset);
outpatientManageMapper.getSkinTestRecords(outpatientSkinTestRecordSearchParam, pageSize, offset);
// 查询总记录数
long total = outpatientManageMapper.countOutpatientSkinTestRecords(outpatientSkinTestRecordSearchParam);

8
openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientManageMapper.java
View File

@@ -29,7 +29,7 @@ public interface OutpatientManageMapper {
* @param offset 跳过条数
* @return 分页查询
*/
List<OutpatientSkinTestRecordDto> getOutpatientSkinTestRecord(
List<OutpatientSkinTestRecordDto> getSkinTestRecords(
@Param("OutpatientSkinTestRecordSearchParam") OutpatientSkinTestRecordSearchParam outpatientSkinTestRecordSearchParam,
@Param("pageSize") Integer pageSize, @Param("offset") Integer offset);
@@ -62,11 +62,5 @@ public interface OutpatientManageMapper {
List<OutpatientInfusionRecordDto>
getOutpatientInfusionRecord(@Param(Constants.WRAPPER) QueryWrapper<OutpatientInfusionRecordDto> queryWrapper);
/**
* 获取医生名字列表
*
* @return 医生名字列表
*/
List<String> getDoctorNames();
}

4
openhis-server/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientManageMapper.xml
View File

@@ -131,7 +131,7 @@
<!-- 门诊输液记录患者列表信息查询-->
<select id="getOutpatientInfusionPatient"
resultType="com.openhis.web.outpatientmanage.dto.OutpatientInfusionSearchParam">
resultType="com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto">
SELECT
T1.service_id,
T1.prescription_no,
@@ -176,7 +176,7 @@
<!-- 门诊输液记录初始化，默认显示今天待执行输液记录-->
<select id="getOutpatientInfusionRecord"
resultType="com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto">
resultType="com.openhis.web.outpatientmanage.dto.OutpatientInfusionRecordDto">
SELECT
T1.service_id,
T1.bus_no,

2
openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml
View File

@@ -203,7 +203,7 @@
</select>
<!-- 查询医生名字列表-->
<select id="getDoctorNames" resultType="java.lang.String">
<select id="getDoctorNames" resultType ="java.lang.String">
SELECT MIN(p.name) AS practitioner_name
FROM adm_encounter_participant ep
LEFT JOIN adm_practitioner p ON ep.practitioner_id = p.id