From 3d09f06d1d935cc0b9a210c04c4b22908a418059 Mon Sep 17 00:00:00 2001 From: liuhongrui Date: Wed, 19 Mar 2025 19:45:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E8=AF=8A=E8=BE=93=E6=B6=B2=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IOutpatientInfusionRecordService.java | 13 +- .../OutpatientInfusionRecordServiceImpl.java | 117 +++++-------- .../OutpatientInfusionRecordController.java | 34 ++-- .../dto/OutpatientInfusionPatientDto.java | 3 + .../dto/OutpatientInfusionSearchParam.java | 24 --- .../mapper/OutpatientManageMapper.java | 10 +- .../OutpatientManageMapper.xml | 158 +++++++++--------- .../common/constant/CommonConstants.java | 13 +- 8 files changed, 163 insertions(+), 209 deletions(-) delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionSearchParam.java diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientInfusionRecordService.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientInfusionRecordService.java index f918a6ec..6203c6e4 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientInfusionRecordService.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientInfusionRecordService.java @@ -5,7 +5,8 @@ import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; import com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto; import com.openhis.web.outpatientmanage.dto.OutpatientInfusionRecordDto; -import com.openhis.web.outpatientmanage.dto.OutpatientInfusionSearchParam; + +import javax.servlet.http.HttpServletRequest; /** * 门诊管理——输液实现类 @@ -18,13 +19,13 @@ public interface IOutpatientInfusionRecordService { /** * 获取门诊输液记录的患者列表 * - * @param outpatientInfusionSearchParam 门诊输液记录的患者列表查询参数 + * @param searchKey 模糊查询关键字 * @param pageNo 当前页 * @param pageSize 每页多少条 * @return 分页查询 */ IPage getOutpatientInfusionPatientList( - OutpatientInfusionSearchParam outpatientInfusionSearchParam, Integer pageNo, Integer pageSize); + String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request); /** * 点击患者，查询该患者的输液记录 @@ -33,7 +34,7 @@ public interface IOutpatientInfusionRecordService { * @return 当前患者门诊输液待执行列表 */ List - getPatientInfusionRecord(OutpatientInfusionPatientDto outpatientInfusionPatientDto); + getPatientInfusionRecord(OutpatientInfusionPatientDto outpatientInfusionPatientDto, HttpServletRequest request); /** * 执行患者门诊输液 @@ -54,11 +55,9 @@ public interface IOutpatientInfusionRecordService { /** * 门诊输液执行历史记录查询 * - * @param beginTime 开始时间 - * @param endTime 结束时间 * @param historyFlag 查询的是否为执行履历 * @return 门诊输液记录列表 */ - List getPatientInfusionPerformRecord(String beginTime, String endTime,boolean historyFlag); + List getPatientInfusionPerformRecord(HttpServletRequest request,boolean historyFlag); } 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 af74229b..2de43133 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 @@ -1,16 +1,15 @@ package com.openhis.web.outpatientmanage.appservice.impl; -import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -33,7 +32,6 @@ import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.outpatientmanage.appservice.IOutpatientInfusionRecordService; import com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto; import com.openhis.web.outpatientmanage.dto.OutpatientInfusionRecordDto; -import com.openhis.web.outpatientmanage.dto.OutpatientInfusionSearchParam; import com.openhis.web.outpatientmanage.mapper.OutpatientManageMapper; import com.openhis.workflow.domain.ServiceRequest; import com.openhis.workflow.mapper.ServiceRequestMapper; @@ -67,49 +65,20 @@ public class OutpatientInfusionRecordServiceImpl implements IOutpatientInfusionR /** * 获取门诊输液记录的患者列表 * - * @param outpatientInfusionSearchParam 门诊输液记录的患者列表查询参数 + * @param searchKey 模糊查询关键字 * @param pageNo 当前页 * @param pageSize 每页多少条 * @return 分页查询 */ @Override - public IPage getOutpatientInfusionPatientList( - OutpatientInfusionSearchParam outpatientInfusionSearchParam, Integer pageNo, Integer pageSize) { - - LocalDateTime beginTime; - LocalDateTime endTime; - String searchKey; - // 搜索key为空 - if (outpatientInfusionSearchParam == null) { - searchKey = null; - } else { - searchKey = outpatientInfusionSearchParam.getSearchKey(); - } - // 任意开始结束时间为空，默认查询当天日期记录 - if (outpatientInfusionSearchParam.getBeginTime() == null - || outpatientInfusionSearchParam.getEndTime() == null) { - beginTime = DateUtils.startDayOrEndDay(DateUtils.getDate(), true); - endTime = DateUtils.startDayOrEndDay(DateUtils.getDate(), false); - } else {// 时间不空，删选时间 - beginTime = DateUtils.startDayOrEndDay(outpatientInfusionSearchParam.getBeginTime(), true); - endTime = DateUtils.startDayOrEndDay(outpatientInfusionSearchParam.getEndTime(), false); - } + public IPage getOutpatientInfusionPatientList(String searchKey, Integer pageNo, + Integer pageSize, HttpServletRequest request) { // 构建查询条件 QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(null, searchKey, new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientBusNo, CommonConstants.FieldName.EncounterBusNo, CommonConstants.FieldName.PatientName)), - null); - // based_on_id 是为空的 - queryWrapper.eq(CommonConstants.FieldName.basedOnId, null); - // 状态是未完成的 - queryWrapper.in(CommonConstants.FieldName.requestStatus, EventStatus.IN_PROGRESS.getValue(), - EventStatus.NOT_DONE.getValue()); - // 添加时间段查询条件 - if (beginTime != null && endTime != null) { - queryWrapper.ge(CommonConstants.FieldName.createTime, beginTime); - queryWrapper.le(CommonConstants.FieldName.createTime, endTime); - } + request); IPage outpatientInfusionPatientDto = outpatientManageMapper.getOutpatientInfusionPatient(new Page<>(pageNo, pageSize), queryWrapper); @@ -131,25 +100,29 @@ public class OutpatientInfusionRecordServiceImpl implements IOutpatientInfusionR * @return 当前患者门诊输液待执行列表 */ @Override - public List - getPatientInfusionRecord(OutpatientInfusionPatientDto outpatientInfusionPatientDto) { + public List getPatientInfusionRecord( + OutpatientInfusionPatientDto outpatientInfusionPatientDto, HttpServletRequest request) { if (outpatientInfusionPatientDto == null && outpatientInfusionPatientDto.getPatientId() != null) { return null; } - // 创建查询包装器 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(OutpatientInfusionRecordDto::getPatientId, outpatientInfusionPatientDto.getPatientId()); - // based_on_id 是为空的 - queryWrapper.eq(OutpatientInfusionRecordDto::getBasedOnId, null); - // 状态是未完成的 - queryWrapper.in(OutpatientInfusionRecordDto::getRequestStatus, EventStatus.IN_PROGRESS.getValue(), - EventStatus.NOT_DONE.getValue()); - // 从数据库获取输液记录列表 - List infusionList = - outpatientManageMapper.getOutpatientInfusionRecord(queryWrapper); - return infusionList; + // 构建查询条件 + QueryWrapper queryWrapper = + HisQueryUtils.buildQueryWrapper(null, null, null, request); + + queryWrapper.eq(CommonConstants.FieldName.PatientId, outpatientInfusionPatientDto.getPatientId()); + // based_on_id 是为空的 + queryWrapper.eq(CommonConstants.FieldName.BasedOnId, null); + // 状态是未完成的 + queryWrapper.in(CommonConstants.FieldName.RequestStatus, EventStatus.IN_PROGRESS.getValue(), + EventStatus.NOT_DONE.getValue()); + + // 默认显示100条 + IPage OutpatientInfusionRecordPage = + outpatientManageMapper.getOutpatientInfusionRecord(new Page<>(1, 100), queryWrapper); + + return OutpatientInfusionRecordPage.getRecords(); } /** @@ -178,8 +151,9 @@ public class OutpatientInfusionRecordServiceImpl implements IOutpatientInfusionR List groupRecords = entry.getValue(); // 获取组内药品个数 - Long groupCount = outpatientManageMapper.countMedicationExecuteNum(groupRecords.get(0).getServiceId(), null, + Long groupCount = outpatientManageMapper.countExecuteNumOrGroupNum(groupRecords.get(0).getServiceId(), null, groupRecords.get(0).getGroupId(), false); + // 检查组内药品是否全部选中 if (groupCount != groupRecords.size()) { return false; @@ -191,7 +165,7 @@ public class OutpatientInfusionRecordServiceImpl implements IOutpatientInfusionR String prefixBusNo = record.getBusNo() + "." + record.getGroupId() + "." + record.getMedicationId(); // 获取执行次数 Long exeCount = - outpatientManageMapper.countMedicationExecuteNum(record.getServiceId(), prefixBusNo, null, true); + outpatientManageMapper.countExecuteNumOrGroupNum(record.getServiceId(), prefixBusNo, null, true); if (exeCount < record.getExecuteNum()) { ServiceRequest serviceRequest = new ServiceRequest(); @@ -216,7 +190,7 @@ public class OutpatientInfusionRecordServiceImpl implements IOutpatientInfusionR String prefixBusNo = record.getBusNo() + "." + record.getGroupId() + "." + record.getMedicationId(); // 获取执行次数 Long exeCount = - outpatientManageMapper.countMedicationExecuteNum(record.getServiceId(), prefixBusNo, null, true); + outpatientManageMapper.countExecuteNumOrGroupNum(record.getServiceId(), prefixBusNo, null, true); // 执行完毕后，更新执行服务请求表的状态 if (exeCount.equals(record.getExecuteNum())) { @@ -267,49 +241,36 @@ public class OutpatientInfusionRecordServiceImpl implements IOutpatientInfusionR /** * 显示门诊输液执行记录查询 * - * @param beginTime 开始时间 - * @param endTime 结束时间 * @param historyFlag 查询的是否为执行履历 * @return 门诊输液执行记录查询 */ @Override - public List getPatientInfusionPerformRecord(String beginTime, String endTime, + public List getPatientInfusionPerformRecord(HttpServletRequest request, boolean historyFlag) { - LocalDateTime beginDateTime; - LocalDateTime endDateTime; - // 筛选时间不传,默认当天记录 - if (beginTime == null || endTime == null) { - beginDateTime = DateUtils.startDayOrEndDay(DateUtils.getDate(), true); - endDateTime = DateUtils.startDayOrEndDay(DateUtils.getDate(), false); - } else { - beginDateTime = DateUtils.startDayOrEndDay(beginTime, true); - endDateTime = DateUtils.startDayOrEndDay(endTime, false); - } + // 构建查询条件 + QueryWrapper queryWrapper = + HisQueryUtils.buildQueryWrapper(null, null, null, request); - // 创建查询包装器 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); // 执行历史查询的条件 if (historyFlag) { // based_on_id 不为空，此条件筛选出执行履历 - queryWrapper.isNotNull(OutpatientInfusionRecordDto::getBasedOnId); + queryWrapper.isNotNull(CommonConstants.FieldName.BasedOnId); // 状态是已完成 - queryWrapper.eq(OutpatientInfusionRecordDto::getRequestStatus, EventStatus.COMPLETED.getValue()); + queryWrapper.eq(CommonConstants.FieldName.RequestStatus, EventStatus.COMPLETED.getValue()); // 门诊输液待执行记录查询 } else { // based_on_id 为空，此条件筛选控制不显示执行履历 - queryWrapper.isNull(OutpatientInfusionRecordDto::getBasedOnId); + queryWrapper.isNull(CommonConstants.FieldName.BasedOnId); // 状态是进行中 - queryWrapper.eq(OutpatientInfusionRecordDto::getRequestStatus, EventStatus.IN_PROGRESS.getValue()); + queryWrapper.eq(CommonConstants.FieldName.RequestStatus, EventStatus.IN_PROGRESS.getValue()); } - // 时间筛选 - queryWrapper.ge(OutpatientInfusionRecordDto::getCreateTime, beginDateTime); - queryWrapper.le(OutpatientInfusionRecordDto::getCreateTime, endDateTime); - // 从数据库获取输液记录列表 - List infusionPerformList = - outpatientManageMapper.getOutpatientInfusionRecord(queryWrapper); + // 默认显示100条 + IPage OutpatientInfusionRecordPage = + outpatientManageMapper.getOutpatientInfusionRecord(new Page<>(1, 100), queryWrapper); + List infusionPerformList = OutpatientInfusionRecordPage.getRecords(); // 遍历列表并处理每个记录 infusionPerformList.forEach(e -> { diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionRecordController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionRecordController.java index 59ddd293..9f7f3e7d 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionRecordController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionRecordController.java @@ -2,6 +2,8 @@ package com.openhis.web.outpatientmanage.controller; import java.util.List; +import javax.servlet.http.HttpServletRequest; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -12,7 +14,6 @@ import com.openhis.common.constant.PromptMsgConstant; import com.openhis.web.outpatientmanage.appservice.IOutpatientInfusionRecordService; import com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto; import com.openhis.web.outpatientmanage.dto.OutpatientInfusionRecordDto; -import com.openhis.web.outpatientmanage.dto.OutpatientInfusionSearchParam; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -35,16 +36,18 @@ public class OutpatientInfusionRecordController { /** * 查询门诊输液的患者列表 * - * @param outpatientInfusionSearchParam 查询参数 + * @param searchKey 模糊查询关键字 + * @param pageNo 当前页 + * @param pageSize 每页多少条 * @return 返回门诊输液的患者列表 */ @GetMapping(value = "/infusion-patient-list") - public R getOutpatientInfusionPatientList(OutpatientInfusionSearchParam outpatientInfusionSearchParam, + public R getOutpatientInfusionPatientList(@RequestParam(value = "searchKey", defaultValue = "") String searchKey, @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) { - return R.ok(outpatientInfusionRecordService.getOutpatientInfusionPatientList(outpatientInfusionSearchParam, - pageNo, pageSize)); + return R + .ok(outpatientInfusionRecordService.getOutpatientInfusionPatientList(searchKey, pageNo, pageSize, request)); } /** @@ -54,9 +57,10 @@ public class OutpatientInfusionRecordController { * @return 当前患者门诊输液待执行列表 */ @GetMapping(value = "/patient-infusion-record") - public R getPatientInfusionRecord(OutpatientInfusionPatientDto outpatientInfusionPatientDto) { + public R getPatientInfusionRecord(OutpatientInfusionPatientDto outpatientInfusionPatientDto, + HttpServletRequest request) { - return R.ok(outpatientInfusionRecordService.getPatientInfusionRecord(outpatientInfusionPatientDto)); + return R.ok(outpatientInfusionRecordService.getPatientInfusionRecord(outpatientInfusionPatientDto, request)); } /** @@ -94,29 +98,23 @@ public class OutpatientInfusionRecordController { /** * 门诊输液待执行记录查询 * - * @param beginTime 开始时间 - * @param endTime 结束时间 * @return 门诊输液待执行记录列表 */ @GetMapping(value = "/infusion-wait-perform-record") - public R getPatientInfusionRecords(@RequestParam(required = false) String beginTime, - @RequestParam(required = false) String endTime) { + public R getPatientInfusionRecords(HttpServletRequest request) { - return R.ok(outpatientInfusionRecordService.getPatientInfusionPerformRecord(beginTime, endTime, false)); + return R.ok(outpatientInfusionRecordService.getPatientInfusionPerformRecord(request, false)); } /** * 门诊输液执行历史记录查询 * - * @param beginTime 开始时间 - * @param endTime 结束时间 * @return 门诊输液执行历史记录列表 */ @GetMapping(value = "/infusion-perform-record") - public R getPatientInfusionPerformRecord(@RequestParam(required = false) String beginTime, - @RequestParam(required = false) String endTime) { + public R getPatientInfusionPerformRecord(HttpServletRequest request) { - return R.ok(outpatientInfusionRecordService.getPatientInfusionPerformRecord(beginTime, endTime, true)); + return R.ok(outpatientInfusionRecordService.getPatientInfusionPerformRecord(request, true)); } } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionPatientDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionPatientDto.java index 00a29224..30797d28 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionPatientDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionPatientDto.java @@ -50,4 +50,7 @@ public class OutpatientInfusionPatientDto { /** 病人年龄 */ private String ageString; + /** 开单时间 */ + private Date createTime; + } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionSearchParam.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionSearchParam.java deleted file mode 100644 index a0869482..00000000 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionSearchParam.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.openhis.web.outpatientmanage.dto; - -import lombok.Data; - -/** - * 门诊输液记录查询体体条件类 - * - * @author liuhr - * @date 2025/3/12 - */ -@Data -public class OutpatientInfusionSearchParam { - - /** 病人ID/门诊号/病人姓名 */ - private String searchKey; - - /** 筛选开始时间 */ - private String beginTime; - - /** 筛选结束时间 */ - private String endTime; - -} - 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 e5bd3d49..ba2d00c1 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 @@ -1,7 +1,9 @@ package com.openhis.web.outpatientmanage.mapper; +import java.util.Date; import java.util.List; +import com.openhis.workflow.domain.ServiceRequest; import org.apache.ibatis.annotations.Param; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -57,11 +59,13 @@ public interface OutpatientManageMapper { /** * 门诊输液记录查询 * + * @param page 分页参数，默认100条记录 * @param queryWrapper 查询条件 * @return 门诊输液记录列表 */ - List getOutpatientInfusionRecord( - @Param(Constants.WRAPPER) LambdaQueryWrapper queryWrapper); + IPage getOutpatientInfusionRecord( + @Param("page") Page page, + @Param(Constants.WRAPPER) QueryWrapper queryWrapper); /** * 查询药品已执行数量/查询同组内药品数量 @@ -72,7 +76,7 @@ public interface OutpatientManageMapper { * @param flag 控制查询条件 * @return 查询个数 */ - long countMedicationExecuteNum(@Param("paramId") Long paramId, @Param("prefixBusNo") String prefixBusNo, + long countExecuteNumOrGroupNum(@Param("paramId") Long paramId, @Param("prefixBusNo") String prefixBusNo, @Param("groupId") Long groupId, @Param("flag") boolean flag); } 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 bff580d1..f4b66287 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 @@ -133,32 +133,34 @@ - SELECT COUNT(*) FROM @@ -281,7 +290,7 @@ - AND sr.base_on_id = #{paramId} + AND sr.based_on_id = #{paramId} AND sr.bus_no LIKE CONCAT(#{prefixBusNo}, '%') AND sr.status_enum = 6 --服务状态是已完成 @@ -292,7 +301,6 @@ AND mr.group_id = #{groupId} AND sr.status_enum = 2 --服务状态是进行中 - diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java index 8de702bb..820f93fa 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java @@ -113,11 +113,16 @@ public class CommonConstants { */ String PatientBusNo = "patient_bus_no"; + /** + * 患者ID + */ + String PatientId = "patient_id"; + + /** * 就诊号 */ String EncounterBusNo = "encounter_bus_no"; - /** * 身份证号 */ @@ -141,17 +146,17 @@ public class CommonConstants { /** * 请求状态 */ - String requestStatus = "request_status"; + String RequestStatus = "request_status"; /** * 创建时间 */ - String createTime = "create_time"; + String CreateTime = "create_time"; /** * 请求基于什么的ID */ - String basedOnId = "based_on_id"; + String BasedOnId = "based_on_id"; } /**