diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionRecordServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionRecordServiceImpl.java index 91e675cf..edc8ed0a 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionRecordServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionRecordServiceImpl.java @@ -66,12 +66,12 @@ public class OutpatientInfusionRecordServiceImpl implements IOutpatientInfusionR @Autowired ServiceRequestMapper serviceRequestMapper; - @Override /** * 获取门诊输液记录初期数据列表 * * @return 门诊输液记录初期数据列表 */ + @Override public OutpatientInfusionInitDto getOutpatientInfusionInit() { OutpatientInfusionInitDto initDto = new OutpatientInfusionInitDto(); diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestRecordServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestRecordServiceImpl.java index e6cfcb5e..27343093 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestRecordServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestRecordServiceImpl.java @@ -112,7 +112,7 @@ public class OutpatientSkinTestRecordServiceImpl implements IOutpatientSkinTestR Integer offset = (pageNo - 1) * pageSize; // 连表查询患者信息 List listOutpatientSkinTestRecords = - outpatientManageMapper.getOutpatientSkinTestRecord(outpatientSkinTestRecordSearchParam, pageSize, offset); + outpatientManageMapper.getSkinTestRecords(outpatientSkinTestRecordSearchParam, pageSize, offset); // 查询总记录数 long total = outpatientManageMapper.countOutpatientSkinTestRecords(outpatientSkinTestRecordSearchParam); diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientManageMapper.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientManageMapper.java index 5d055ccd..7f2cceeb 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientManageMapper.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientManageMapper.java @@ -29,7 +29,7 @@ public interface OutpatientManageMapper { * @param offset 跳过条数 * @return 分页查询 */ - List getOutpatientSkinTestRecord( + List getSkinTestRecords( @Param("OutpatientSkinTestRecordSearchParam") OutpatientSkinTestRecordSearchParam outpatientSkinTestRecordSearchParam, @Param("pageSize") Integer pageSize, @Param("offset") Integer offset); @@ -62,11 +62,5 @@ public interface OutpatientManageMapper { List getOutpatientInfusionRecord(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); - /** - * 获取医生名字列表 - * - * @return 医生名字列表 - */ - List getDoctorNames(); } diff --git a/openhis-server/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientManageMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientManageMapper.xml index b53b9b59..77890edd 100644 --- a/openhis-server/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientManageMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientManageMapper.xml @@ -131,7 +131,7 @@ + resultType="com.openhis.web.outpatientmanage.dto.OutpatientInfusionRecordDto"> SELECT T1.service_id, T1.bus_no, diff --git a/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml index 852b13d1..b7cce3cd 100644 --- a/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml @@ -203,7 +203,7 @@ - SELECT MIN(p.name) AS practitioner_name FROM adm_encounter_participant ep LEFT JOIN adm_practitioner p ON ep.practitioner_id = p.id