From e854ef2b9cbe0b24ac696162dc60e27461018f42 Mon Sep 17 00:00:00 2001 From: "Zhang.WH" Date: Thu, 13 Mar 2025 14:33:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=A0=91=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E9=97=A8=E8=AF=8A=E6=94=B6=E8=B4=B9?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=EF=BC=8C=E4=BB=B7=E6=A0=BC=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=AF=B9=E5=BA=94=E4=BB=A3=E7=A0=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/config/MybatisPlusConfig.java | 2 +- .../IOutpatientChargeAppService.java | 31 ++++++ .../IOutpatientRegistrationAppService.java | 4 +- .../impl/OutpatientChargeAppServiceImpl.java | 71 ++++++++++++++ .../OutpatientRegistrationAppServiceImpl.java | 8 +- .../OutpatientChargeController.java | 54 +++++++++++ .../OutpatientRegistrationController.java | 10 +- .../dto/AccountFormData.java | 2 +- .../dto/ChargeItemFormData.java | 2 +- .../dto/ContractMetadata.java | 2 +- .../dto/CurrentDayEncounterDto.java | 2 +- .../dto/EncounterDiagnosisFormData.java | 3 +- .../dto/EncounterFormData.java | 3 +- .../dto/EncounterLocationFormData.java | 3 +- .../dto/EncounterParticipantFormData.java | 3 +- .../dto/EncounterPatientPageDto.java | 94 +++++++++++++++++++ .../dto/EncounterPatientPageParam.java | 58 ++++++++++++ .../dto/OutpatientRegistrationAddParam.java | 2 +- .../dto/OutpatientRegistrationInitDto.java | 2 +- .../dto/PatientMetadata.java | 2 +- .../dto/PractitionerMetadata.java | 2 +- .../mapper/OutpatientChargeAppMapper.java | 33 +++++++ .../OutpatientRegistrationAppMapper.java | 6 +- .../dto/ChargeItemDefPageDto.java | 8 +- .../datadictionary/dto/ItemDefinitionDto.java | 15 +-- .../impl/DoctorStationMainAppServiceImpl.java | 2 +- .../impl/PurchaseInventoryAppServiceImpl.java | 4 +- .../mapper/PurchaseInventoryMapper.java | 4 +- .../PurchaseInventoryMapper.xml | 2 +- .../ReceiptApprovalMapper.xml | 10 +- .../OutpatientChargeAppMapper.xml | 37 ++++++++ .../OutpatientRegistrationAppMapper.xml | 6 +- .../ChargeItemDefSearchMapper.xml | 30 +++--- .../common/constant/CommonConstants.java | 34 ++++++- .../domain/MedicationDefinition.java | 6 ++ 35 files changed, 479 insertions(+), 78 deletions(-) create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientChargeAppService.java rename openhis-server/openhis-application/src/main/java/com/openhis/web/{outpatientservice => chargemanage}/appservice/IOutpatientRegistrationAppService.java (95%) create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java rename openhis-server/openhis-application/src/main/java/com/openhis/web/{outpatientservice => chargemanage}/appservice/impl/OutpatientRegistrationAppServiceImpl.java (97%) create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientChargeController.java rename openhis-server/openhis-application/src/main/java/com/openhis/web/{outpatientservice => chargemanage}/controller/OutpatientRegistrationController.java (93%) rename openhis-server/openhis-application/src/main/java/com/openhis/web/{outpatientservice => chargemanage}/dto/AccountFormData.java (97%) rename openhis-server/openhis-application/src/main/java/com/openhis/web/{outpatientservice => chargemanage}/dto/ChargeItemFormData.java (97%) rename openhis-server/openhis-application/src/main/java/com/openhis/web/{outpatientservice => chargemanage}/dto/ContractMetadata.java (84%) rename openhis-server/openhis-application/src/main/java/com/openhis/web/{outpatientservice => chargemanage}/dto/CurrentDayEncounterDto.java (97%) rename openhis-server/openhis-application/src/main/java/com/openhis/web/{outpatientservice => chargemanage}/dto/EncounterDiagnosisFormData.java (87%) rename openhis-server/openhis-application/src/main/java/com/openhis/web/{outpatientservice => chargemanage}/dto/EncounterFormData.java (95%) rename openhis-server/openhis-application/src/main/java/com/openhis/web/{outpatientservice => chargemanage}/dto/EncounterLocationFormData.java (92%) rename openhis-server/openhis-application/src/main/java/com/openhis/web/{outpatientservice => chargemanage}/dto/EncounterParticipantFormData.java (90%) create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java rename openhis-server/openhis-application/src/main/java/com/openhis/web/{outpatientservice => chargemanage}/dto/OutpatientRegistrationAddParam.java (94%) rename openhis-server/openhis-application/src/main/java/com/openhis/web/{outpatientservice => chargemanage}/dto/OutpatientRegistrationInitDto.java (92%) rename openhis-server/openhis-application/src/main/java/com/openhis/web/{outpatientservice => chargemanage}/dto/PatientMetadata.java (95%) rename openhis-server/openhis-application/src/main/java/com/openhis/web/{outpatientservice => chargemanage}/dto/PractitionerMetadata.java (93%) create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientChargeAppMapper.java rename openhis-server/openhis-application/src/main/java/com/openhis/web/{outpatientservice => chargemanage}/mapper/OutpatientRegistrationAppMapper.java (88%) rename openhis-server/openhis-application/src/main/resources/mapper/{InventoryManage => Inventorymanage}/PurchaseInventoryMapper.xml (97%) rename openhis-server/openhis-application/src/main/resources/mapper/{InventoryManage => Inventorymanage}/ReceiptApprovalMapper.xml (94%) create mode 100644 openhis-server/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml rename openhis-server/openhis-application/src/main/resources/mapper/{outpatientservice => chargemanage}/OutpatientRegistrationAppMapper.xml (95%) diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java b/openhis-server/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java index 55fcf02d..7ea46d21 100644 --- a/openhis-server/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java +++ b/openhis-server/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java @@ -84,7 +84,7 @@ public class MybatisPlusConfig { private static final Set TENANT_TABLES = new HashSet<>(Arrays.asList( "adm_account", "adm_charge_item", - "adm_charge_item_def_app", + "adm_charge_item_def_detail", "adm_charge_item_definition", "adm_device", "adm_device_definition", diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientChargeAppService.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientChargeAppService.java new file mode 100644 index 00000000..4db73eec --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientChargeAppService.java @@ -0,0 +1,31 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.chargemanage.appservice; + +import com.core.common.core.domain.R; +import com.openhis.web.chargemanage.dto.EncounterPatientPageParam; + +import javax.servlet.http.HttpServletRequest; + +/** + * 门诊收费 service + * + * @author zwh + * @date 2025-03-12 + */ +public interface IOutpatientChargeAppService { + + /** + * 查询就诊患者分页列表 + * + * @param encounterPatientPageParam 查询条件 + * @param searchKey 模糊查询关键字 + * @param pageNo 当前页 + * @param pageSize 每页多少条 + * @param request 请求 + * @return 就诊患者分页列表 + */ + R getEncounterPatientPage(EncounterPatientPageParam encounterPatientPageParam, String searchKey, Integer pageNo, + Integer pageSize, HttpServletRequest request); +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/appservice/IOutpatientRegistrationAppService.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java similarity index 95% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/appservice/IOutpatientRegistrationAppService.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java index 12aa8a25..05421a36 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/appservice/IOutpatientRegistrationAppService.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java @@ -1,4 +1,4 @@ -package com.openhis.web.outpatientservice.appservice; +package com.openhis.web.chargemanage.appservice; import java.util.List; @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.openhis.web.basicservice.dto.HealthcareServiceDto; -import com.openhis.web.outpatientservice.dto.*; +import com.openhis.web.chargemanage.dto.*; /** * 门诊挂号 应用Service diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java new file mode 100644 index 00000000..4e9e9897 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java @@ -0,0 +1,71 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.chargemanage.appservice.impl; + +import java.util.Arrays; +import java.util.HashSet; + +import javax.servlet.http.HttpServletRequest; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.core.common.core.domain.R; +import com.core.common.utils.AgeCalculatorUtil; +import com.openhis.common.constant.CommonConstants; +import com.openhis.common.enums.AdministrativeGender; +import com.openhis.common.utils.EnumUtils; +import com.openhis.common.utils.HisQueryUtils; +import com.openhis.web.chargemanage.appservice.IOutpatientChargeAppService; +import com.openhis.web.chargemanage.dto.EncounterPatientPageDto; +import com.openhis.web.chargemanage.dto.EncounterPatientPageParam; +import com.openhis.web.chargemanage.mapper.OutpatientChargeAppMapper; + +/** + * 门诊收费 impl + * + * @author zwh + * @date 2025-03-12 + */ +@Service +public class OutpatientChargeAppServiceImpl implements IOutpatientChargeAppService { + + @Autowired + private OutpatientChargeAppMapper outpatientChargeAppMapper; + + /** + * 查询就诊患者分页列表 + * + * @param encounterPatientPageParam 查询条件 + * @param searchKey 模糊查询关键字 + * @param pageNo 当前页 + * @param pageSize 每页多少条 + * @param request 请求 + * @return 就诊患者分页列表 + */ + @Override + public R getEncounterPatientPage(EncounterPatientPageParam encounterPatientPageParam, String searchKey, + Integer pageNo, Integer pageSize, HttpServletRequest request) { + // 构建查询条件 + QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper( + encounterPatientPageParam, searchKey, + new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientWbStr, CommonConstants.FieldName.PatientPyStr, + CommonConstants.FieldName.PatientName, CommonConstants.FieldName.PatientBusNo, + CommonConstants.FieldName.EncounterBusNo, CommonConstants.FieldName.idCard)), + request); + // 就诊患者分页列表 + Page encounterPatientPage = + outpatientChargeAppMapper.selectEncounterPatientPage(new Page<>(pageNo, pageSize), queryWrapper); + + encounterPatientPage.getRecords().forEach(e -> { + // 性别枚举 + e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum())); + // 计算年龄 + e.setAge(AgeCalculatorUtil.getAge(e.getBirthDate())); + }); + return R.ok(encounterPatientPage); + } +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/appservice/impl/OutpatientRegistrationAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java similarity index 97% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/appservice/impl/OutpatientRegistrationAppServiceImpl.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java index 634b2283..7aec115b 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/appservice/impl/OutpatientRegistrationAppServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java @@ -1,4 +1,4 @@ -package com.openhis.web.outpatientservice.appservice.impl; +package com.openhis.web.chargemanage.appservice.impl; import java.util.Arrays; import java.util.HashSet; @@ -31,9 +31,9 @@ import com.openhis.financial.domain.Contract; import com.openhis.financial.mapper.ContractMapper; import com.openhis.web.basicservice.dto.HealthcareServiceDto; import com.openhis.web.basicservice.mapper.HealthcareServiceBizMapper; -import com.openhis.web.outpatientservice.appservice.IOutpatientRegistrationAppService; -import com.openhis.web.outpatientservice.dto.*; -import com.openhis.web.outpatientservice.mapper.OutpatientRegistrationAppMapper; +import com.openhis.web.chargemanage.appservice.IOutpatientRegistrationAppService; +import com.openhis.web.chargemanage.dto.*; +import com.openhis.web.chargemanage.mapper.OutpatientRegistrationAppMapper; /** * 门诊挂号 应用实现类 diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientChargeController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientChargeController.java new file mode 100644 index 00000000..a6abbfb2 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientChargeController.java @@ -0,0 +1,54 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.chargemanage.controller; + +import javax.servlet.http.HttpServletRequest; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.core.common.core.domain.R; +import com.openhis.web.chargemanage.appservice.IOutpatientChargeAppService; +import com.openhis.web.chargemanage.dto.EncounterPatientPageParam; + +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +/** + * 门诊收费 controller + * + * @author zwh + * @date 2025-03-12 + */ +@RestController +@RequestMapping("/charge-manage/charge") +@Slf4j +@AllArgsConstructor +public class OutpatientChargeController { + + @Autowired + private IOutpatientChargeAppService outpatientChargeAppService; + + /** + * 查询就诊患者分页列表 + * + * @param encounterPatientPageParam 查询条件 + * @param searchKey 模糊查询关键字 + * @param pageNo 当前页 + * @param pageSize 每页多少条 + * @param request 请求 + * @return 就诊患者分页列表 + */ + @GetMapping(value = "/encounter-patient-page") + public R getEncounterPatientPage(EncounterPatientPageParam encounterPatientPageParam, + @RequestParam(value = "searchKey", defaultValue = "") String searchKey, + @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) { + return R.ok(outpatientChargeAppService.getEncounterPatientPage(encounterPatientPageParam, searchKey, pageNo, + pageSize, request)); + } +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/controller/OutpatientRegistrationController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java similarity index 93% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/controller/OutpatientRegistrationController.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java index 1f8b1cae..5b24cc7a 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/controller/OutpatientRegistrationController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java @@ -1,7 +1,7 @@ /* * Copyright ©2023 CJB-CNIT Team. All rights reserved */ -package com.openhis.web.outpatientservice.controller; +package com.openhis.web.chargemanage.controller; import java.util.List; import java.util.stream.Collectors; @@ -15,9 +15,9 @@ import com.core.common.core.domain.R; import com.openhis.common.enums.LocationForm; import com.openhis.common.enums.PriorityLevel; import com.openhis.web.basedatamanage.appservice.ILocationAppService; -import com.openhis.web.outpatientservice.appservice.IOutpatientRegistrationAppService; -import com.openhis.web.outpatientservice.dto.OutpatientRegistrationAddParam; -import com.openhis.web.outpatientservice.dto.OutpatientRegistrationInitDto; +import com.openhis.web.chargemanage.appservice.IOutpatientRegistrationAppService; +import com.openhis.web.chargemanage.dto.OutpatientRegistrationAddParam; +import com.openhis.web.chargemanage.dto.OutpatientRegistrationInitDto; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -26,7 +26,7 @@ import lombok.extern.slf4j.Slf4j; * 门诊挂号 controller */ @RestController -@RequestMapping("/outpatient-service/register") +@RequestMapping("/charge-manage/register") @Slf4j @AllArgsConstructor public class OutpatientRegistrationController { diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/AccountFormData.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/AccountFormData.java similarity index 97% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/AccountFormData.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/AccountFormData.java index 77b0ca88..afae30a6 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/AccountFormData.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/AccountFormData.java @@ -1,4 +1,4 @@ -package com.openhis.web.outpatientservice.dto; +package com.openhis.web.chargemanage.dto; import java.math.BigDecimal; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/ChargeItemFormData.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java similarity index 97% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/ChargeItemFormData.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java index d1e023f6..15e9ee34 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/ChargeItemFormData.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java @@ -1,4 +1,4 @@ -package com.openhis.web.outpatientservice.dto; +package com.openhis.web.chargemanage.dto; import java.math.BigDecimal; import java.util.Date; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/ContractMetadata.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ContractMetadata.java similarity index 84% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/ContractMetadata.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ContractMetadata.java index 6a5889ec..d3fb66f2 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/ContractMetadata.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ContractMetadata.java @@ -1,4 +1,4 @@ -package com.openhis.web.outpatientservice.dto; +package com.openhis.web.chargemanage.dto; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/CurrentDayEncounterDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java similarity index 97% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/CurrentDayEncounterDto.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java index 995a3a65..5bdd4f51 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/CurrentDayEncounterDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java @@ -1,4 +1,4 @@ -package com.openhis.web.outpatientservice.dto; +package com.openhis.web.chargemanage.dto; import java.util.Date; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/EncounterDiagnosisFormData.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterDiagnosisFormData.java similarity index 87% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/EncounterDiagnosisFormData.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterDiagnosisFormData.java index 002b7c7a..ef1b92a4 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/EncounterDiagnosisFormData.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterDiagnosisFormData.java @@ -1,4 +1,4 @@ -package com.openhis.web.outpatientservice.dto; +package com.openhis.web.chargemanage.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -7,7 +7,6 @@ import lombok.Data; import lombok.experimental.Accessors; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; /** * 就诊诊断 表单数据 diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/EncounterFormData.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterFormData.java similarity index 95% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/EncounterFormData.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterFormData.java index 9929f697..e9b36c3a 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/EncounterFormData.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterFormData.java @@ -1,4 +1,4 @@ -package com.openhis.web.outpatientservice.dto; +package com.openhis.web.chargemanage.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -8,7 +8,6 @@ import lombok.Data; import lombok.experimental.Accessors; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; /** * 就诊 表单数据 diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/EncounterLocationFormData.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterLocationFormData.java similarity index 92% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/EncounterLocationFormData.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterLocationFormData.java index 508d8ea2..f06aec9d 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/EncounterLocationFormData.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterLocationFormData.java @@ -1,4 +1,4 @@ -package com.openhis.web.outpatientservice.dto; +package com.openhis.web.chargemanage.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -9,7 +9,6 @@ import lombok.Data; import lombok.experimental.Accessors; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; /** * 就诊位置 表单数据 diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/EncounterParticipantFormData.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterParticipantFormData.java similarity index 90% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/EncounterParticipantFormData.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterParticipantFormData.java index 0cfc7744..e8be696d 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/EncounterParticipantFormData.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterParticipantFormData.java @@ -1,7 +1,6 @@ -package com.openhis.web.outpatientservice.dto; +package com.openhis.web.chargemanage.dto; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java new file mode 100644 index 00000000..183e452a --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java @@ -0,0 +1,94 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.chargemanage.dto; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; + +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 就诊患者分页dto + * + * @author zwh + * @date 2025-03-12 + */ +@Data +@Accessors(chain = true) +public class EncounterPatientPageDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 就诊ID + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long encounterId; + + /** + * 患者姓名 + */ + private String patientName; + + /** + * 患者院内编码/病历号 + */ + private String patientBusNo; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 拼音码 + */ + private String patientPyStr; + + /** + * 五笔码 + */ + private String patientWbStr; + + /** + * 就诊编码 + */ + private String encounterBusNo; + + /** + * 性别编码 + */ + private Integer genderEnum; + private String genderEnum_enumText; + + /** + * 生日 + */ + private Date birthDate; + + /** + * 账户类型编码 + */ + private String typeCode; + + /** + * 账户余额 + */ + private BigDecimal balanceAmount; + + /** + * 开始时间 + */ + private Date startTime; + + /** + * 年龄 + */ + private String age; +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java new file mode 100644 index 00000000..0c2787d4 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java @@ -0,0 +1,58 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.chargemanage.dto; + +import java.io.Serializable; +import java.util.Date; + +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 就诊患者分页查询条件 + * + * @author zwh + * @date 2025-03-12 + */ +@Data +@Accessors(chain = true) +public class EncounterPatientPageParam implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 患者姓名 + */ + private String patientName; + + /** + * 患者院内编码/病历号 + */ + private String patientBusNo; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 拼音码 + */ + private String patientPyStr; + + /** + * 五笔码 + */ + private String patientWbStr; + + /** + * 就诊编码 + */ + private String encounterBusNo; + + /** + * 开始时间 + */ + private Date startTime; +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/OutpatientRegistrationAddParam.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationAddParam.java similarity index 94% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/OutpatientRegistrationAddParam.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationAddParam.java index 49887267..c41ebfe6 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/OutpatientRegistrationAddParam.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationAddParam.java @@ -1,4 +1,4 @@ -package com.openhis.web.outpatientservice.dto; +package com.openhis.web.chargemanage.dto; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/OutpatientRegistrationInitDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationInitDto.java similarity index 92% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/OutpatientRegistrationInitDto.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationInitDto.java index a9fa09e7..246c8960 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/OutpatientRegistrationInitDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationInitDto.java @@ -1,4 +1,4 @@ -package com.openhis.web.outpatientservice.dto; +package com.openhis.web.chargemanage.dto; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/PatientMetadata.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PatientMetadata.java similarity index 95% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/PatientMetadata.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PatientMetadata.java index 45a3436a..6d3bce21 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/PatientMetadata.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PatientMetadata.java @@ -1,4 +1,4 @@ -package com.openhis.web.outpatientservice.dto; +package com.openhis.web.chargemanage.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/PractitionerMetadata.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PractitionerMetadata.java similarity index 93% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/PractitionerMetadata.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PractitionerMetadata.java index 3d420b05..dc508187 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/PractitionerMetadata.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PractitionerMetadata.java @@ -1,4 +1,4 @@ -package com.openhis.web.outpatientservice.dto; +package com.openhis.web.chargemanage.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientChargeAppMapper.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientChargeAppMapper.java new file mode 100644 index 00000000..9b910bb8 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientChargeAppMapper.java @@ -0,0 +1,33 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.chargemanage.mapper; + +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.openhis.web.chargemanage.dto.EncounterPatientPageDto; +import com.openhis.web.chargemanage.dto.EncounterPatientPageParam; + +/** + * 门诊收费 appMapper + * + * @author zwh + * @date 2025-03-13 + */ +@Repository +public interface OutpatientChargeAppMapper { + + /** + * 查询就诊患者分页列表 + * + * @param page 分页 + * @param queryWrapper 查询条件 + * @return 就诊患者分页列表 + */ + Page selectEncounterPatientPage(@Param("page") Page page, + @Param(Constants.WRAPPER) QueryWrapper queryWrapper); +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/mapper/OutpatientRegistrationAppMapper.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java similarity index 88% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/mapper/OutpatientRegistrationAppMapper.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java index 10f4248d..b2d40beb 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/mapper/OutpatientRegistrationAppMapper.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java @@ -1,4 +1,4 @@ -package com.openhis.web.outpatientservice.mapper; +package com.openhis.web.chargemanage.mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.openhis.web.outpatientservice.dto.CurrentDayEncounterDto; -import com.openhis.web.outpatientservice.dto.PractitionerMetadata; +import com.openhis.web.chargemanage.dto.CurrentDayEncounterDto; +import com.openhis.web.chargemanage.dto.PractitionerMetadata; /** * 门诊挂号 应用Mapper diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java index 16fbf2e4..8fa53297 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java @@ -47,11 +47,11 @@ public class ChargeItemDefPageDto { /** 拆零比 */ private BigDecimal partPercent; - /** 指导价 */ - private BigDecimal conditionYbCode; + /** 条件 */ + private String conditionCode; - /** 批次号 */ - private String conditionLotnumber; + /** 命中值 */ + private String conditionValue; /** 价格 */ private BigDecimal price; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java index 9413ceb6..9dc4dbe6 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java @@ -68,21 +68,12 @@ public class ItemDefinitionDto { /** 条件规则 */ private Long conditionRuleId; - /** 批次号 */ - private String conditionLotnumber; - - /** 医保相关价格 */ - private String conditionYbCode; - - /** 采购售卖条件 */ - private String conditionInoutCode; - - /** 条件类型 */ - private String conditionUnitCode; - /** 条件 */ private String conditionCode; + /** 命中值 */ + private String conditionValue; + /** 优先级 */ private Integer priority; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java index 29a64b7b..90408bb5 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java @@ -5,7 +5,6 @@ import java.util.HashSet; import javax.annotation.Resource; -import com.core.common.utils.SecurityUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,6 +13,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AgeCalculatorUtil; +import com.core.common.utils.SecurityUtils; import com.openhis.administration.domain.Encounter; import com.openhis.administration.mapper.EncounterMapper; import com.openhis.common.enums.*; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java index 5aa75754..964378f1 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java @@ -62,10 +62,10 @@ public class PurchaseInventoryAppServiceImpl implements IPurchaseInventoryAppSer // 设置模糊查询的字段名 HashSet searchFields = new HashSet<>(); - searchFields.add(CommonConstants.FieldName.BusNo); + searchFields.add(CommonConstants.FieldName.SupplyBusNo); // 构建查询条件 - QueryWrapper queryWrapper = + QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(inventorySearchParam, searchKey, searchFields, request); // 查询入库单据分页列表 Page inventoryReceiptPage = purchaseInventoryMapper.selectInventoryReceiptPage( diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseInventoryMapper.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseInventoryMapper.java index 32525ddd..d17560dc 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseInventoryMapper.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseInventoryMapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.inventorymanage.dto.InventoryReceiptPageDto; -import com.openhis.workflow.domain.SupplyRequest; +import com.openhis.web.inventorymanage.dto.InventorySearchParam; /** * 采购入库查询用 mapper @@ -30,6 +30,6 @@ public interface PurchaseInventoryMapper { * @return 入库单据分页列表 */ Page selectInventoryReceiptPage(@Param("page") Page page, - @Param(Constants.WRAPPER) QueryWrapper queryWrapper, + @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("purchaseInventory") Integer purchaseInventory); } diff --git a/openhis-server/openhis-application/src/main/resources/mapper/InventoryManage/PurchaseInventoryMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml similarity index 97% rename from openhis-server/openhis-application/src/main/resources/mapper/InventoryManage/PurchaseInventoryMapper.xml rename to openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml index 4bf8104d..cf7732a9 100644 --- a/openhis-server/openhis-application/src/main/resources/mapper/InventoryManage/PurchaseInventoryMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml @@ -5,7 +5,7 @@ + SELECT T3.encounter_id, + T3.encounter_bus_no, + T3.start_time, + T3.patient_name, + T3.patient_bus_no, + T3.gender_enum, + T3.birth_date, + T3.id_card, + T3.patient_py_str, + T3.patient_wb_str + FROM ( + SELECT T1.id AS encounter_id, + T1.bus_no AS encounter_bus_no, + T1.start_time, + T1.delete_flag, + T2."name" AS patient_name, + T2.bus_no AS patient_bus_no, + T2.gender_enum, + T2.birth_date, + T2.id_card, + T2.py_str AS patient_py_str, + T2.wb_str AS patient_wb_str + FROM adm_encounter AS T1 + LEFT JOIN adm_patient AS T2 + ON T1.patient_id = T2.id + WHERE T1.delete_flag = '0' + ORDER BY T1.encounter_bus_no DESC + ) AS T3 + ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/openhis-server/openhis-application/src/main/resources/mapper/outpatientservice/OutpatientRegistrationAppMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml similarity index 95% rename from openhis-server/openhis-application/src/main/resources/mapper/outpatientservice/OutpatientRegistrationAppMapper.xml rename to openhis-server/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml index 11a244a6..4a8aef56 100644 --- a/openhis-server/openhis-application/src/main/resources/mapper/outpatientservice/OutpatientRegistrationAppMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml @@ -2,9 +2,9 @@ - + - SELECT T3.tenant_id, T3.ID, T3.NAME, @@ -39,7 +39,7 @@ AND create_time > CURRENT_DATE - SELECT T9.tenant_id, T9.encounter_id, T9.organization_id, diff --git a/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/ChargeItemDefSearchMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/ChargeItemDefSearchMapper.xml index 73909223..6d6222eb 100644 --- a/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/ChargeItemDefSearchMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/ChargeItemDefSearchMapper.xml @@ -16,8 +16,8 @@ T5.update_time, T5.item_id, T5.condition_rule_id, - T5.condition_lotnumber, - T5.condition_yb_code, + T5.condition_value, + T5.condition_code, T5.priority, T5.amount, T5.item_no, @@ -48,8 +48,8 @@ T1.update_time, T2.id AS item_id, T2.condition_rule_id, - T2.condition_lotnumber, - T2.condition_yb_code, + T2.condition_value, + T2.condition_code, T2.priority, T2.amount, T3.bus_no AS item_no, @@ -62,7 +62,7 @@ T4.lot_number FROM adm_charge_item_definition T1 - LEFT JOIN adm_charge_item_def_app T2 + LEFT JOIN adm_charge_item_def_detail T2 ON T1.id = T2.definition_id LEFT JOIN med_medication_definition T3 ON T1.instance_id = T3.id @@ -86,8 +86,8 @@ T5.update_time, T5.item_id, T5.condition_rule_id, - T5.condition_lotnumber, - T5.condition_yb_code, + T5.condition_value, + T5.condition_code, T5.priority, T5.amount, T5.item_no, @@ -117,8 +117,8 @@ T1.update_time, T2.id AS item_id, T2.condition_rule_id, - T2.condition_lotnumber, - T2.condition_yb_code, + T2.condition_value, + T2.condition_code, T2.priority, T2.amount, T3.bus_no AS item_no, @@ -130,7 +130,7 @@ T4.lot_number FROM adm_charge_item_definition T1 - LEFT JOIN adm_charge_item_def_app T2 + LEFT JOIN adm_charge_item_def_detail T2 ON T1.id = T2.definition_id LEFT JOIN adm_device_definition T3 ON T1.instance_id = T3.id @@ -154,8 +154,8 @@ T5.update_time, T5.item_id, T5.condition_rule_id, - T5.condition_lotnumber, - T5.condition_yb_code, + T5.condition_value, + T5.condition_code, T5.priority, T5.amount, T5.item_no, @@ -183,8 +183,8 @@ T1.update_time, T2.id AS item_id, T2.condition_rule_id, - T2.condition_lotnumber, - T2.condition_yb_code, + T2.condition_value, + T2.condition_code, T2.priority, T2.amount, T3.bus_no AS item_no, @@ -194,7 +194,7 @@ T1.yb_type AS category_code FROM adm_charge_item_definition T1 - LEFT JOIN adm_charge_item_def_app T2 + LEFT JOIN adm_charge_item_def_detail T2 ON T1.id = T2.definition_id LEFT JOIN wor_activity_definition T3 ON T1.instance_id = T3.id 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 d98795ce..f7ad3d4d 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 @@ -79,9 +79,39 @@ public class CommonConstants { public interface FieldName { /** - * 业务编码 + * 单据号 */ - String BusNo = "bus_no"; + String SupplyBusNo = "supply_bus_no"; + + /** + * 患者院内编码 + */ + String PatientBusNo = "patient_bus_no"; + + /** + * 就诊号 + */ + String EncounterBusNo = "encounter_bus_no"; + + /** + * 身份证号 + */ + String idCard = "id_card"; + + /** + * 拼音码 + */ + String PatientPyStr = "patient_py_str"; + + /** + * 五笔码 + */ + String PatientWbStr = "patient_wb_str"; + + /** + * 患者姓名 + */ + String PatientName = "patient_name"; } /** diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java index eb0f09f2..94540128 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java @@ -111,4 +111,10 @@ public class MedicationDefinition extends HisBaseEntity { /** 儿童用药标志 */ private Integer childrenFlag; + /** 最小库存警戒数量(常规单位) */ + private BigDecimal itemMinQuantity; + + /** 最大库存警戒数量(常规单位) */ + private BigDecimal itemMaxQuantity; + } \ No newline at end of file