目录树变更，新增门诊收费相关，价格定义字段对应代码修改

openhis-server/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java

@@ -84,7 +84,7 @@ public class MybatisPlusConfig {
             private static final Set<String> 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",

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);
+}

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

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<EncounterPatientPageParam> 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<EncounterPatientPageDto> 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);
+    }
+}

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.chargemanage.appservice.IOutpatientRegistrationAppService;
-import com.openhis.web.outpatientservice.dto.*;
+import com.openhis.web.chargemanage.dto.*;
-import com.openhis.web.outpatientservice.mapper.OutpatientRegistrationAppMapper;
+import com.openhis.web.chargemanage.mapper.OutpatientRegistrationAppMapper;
 
 /**
  * 门诊挂号 应用实现类

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));
+    }
+}

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.chargemanage.appservice.IOutpatientRegistrationAppService;
-import com.openhis.web.outpatientservice.dto.OutpatientRegistrationAddParam;
+import com.openhis.web.chargemanage.dto.OutpatientRegistrationAddParam;
-import com.openhis.web.outpatientservice.dto.OutpatientRegistrationInitDto;
+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 {

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;
 

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;

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;

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;
 

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;
 
 /**
  * 就诊诊断 表单数据

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;
 
 /**
  * 就诊 表单数据

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;
 
 /**
  * 就诊位置 表单数据

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;

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;
+}

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;
+}

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;

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;

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;

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;

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<EncounterPatientPageDto> selectEncounterPatientPage(@Param("page") Page<EncounterPatientPageDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<EncounterPatientPageParam> queryWrapper);
+}

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.chargemanage.dto.CurrentDayEncounterDto;
-import com.openhis.web.outpatientservice.dto.PractitionerMetadata;
+import com.openhis.web.chargemanage.dto.PractitionerMetadata;
 
 /**
  * 门诊挂号 应用Mapper

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;

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;
 

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.*;

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<String> searchFields = new HashSet<>();
-        searchFields.add(CommonConstants.FieldName.BusNo);
+        searchFields.add(CommonConstants.FieldName.SupplyBusNo);
 
         // 构建查询条件
-        QueryWrapper<SupplyRequest> queryWrapper =
+        QueryWrapper<InventorySearchParam> queryWrapper =
             HisQueryUtils.buildQueryWrapper(inventorySearchParam, searchKey, searchFields, request);
         // 查询入库单据分页列表
         Page<InventoryReceiptPageDto> inventoryReceiptPage = purchaseInventoryMapper.selectInventoryReceiptPage(

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<InventoryReceiptPageDto> selectInventoryReceiptPage(@Param("page") Page<InventoryReceiptPageDto> page,
-        @Param(Constants.WRAPPER) QueryWrapper<SupplyRequest> queryWrapper,
+        @Param(Constants.WRAPPER) QueryWrapper<InventorySearchParam> queryWrapper,
         @Param("purchaseInventory") Integer purchaseInventory);
 }

openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml

@@ -5,7 +5,7 @@
     <select id="selectInventoryReceiptPage"
             resultType="com.openhis.web.inventorymanage.dto.InventoryReceiptPageDto">
         SELECT T2.id,
-               T2.bus_no,
+               T2.bus_no AS supply_bus_no,
                T2.status_enum,
                T2.supplier_id,
                T2.purpose_location_id,

openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml

@@ -38,12 +38,12 @@
                 ON T2.id = T1.item_id
             LEFT JOIN adm_charge_item_definition T3
                 ON T2.id = T3.instance_id
-            LEFT JOIN adm_charge_item_def_app T4
+            LEFT JOIN adm_charge_item_def_detail T4
                  ON T3.id = T4.definition_id
                     AND T1.unit_code = T4.condition_unit_code
         WHERE T1.bus_no = #{busNo}
             AND T5.status_enum = #{completed}
-            AND T1.delete_flag = 0
+            AND T1.delete_flag = '0'
     </select>
 
     <select id="selectSupplyDevDetail" resultType="com.openhis.web.inventorymanage.dto.SupplyItemDetailDto">
@@ -81,12 +81,12 @@
                            ON T2.id = T1.item_id
                  LEFT JOIN adm_charge_item_definition T3
                            ON T2.id = T3.instance_id
-                 LEFT JOIN adm_charge_item_def_app T4
+                 LEFT JOIN adm_charge_item_def_detail T4
                            ON T3.id = T4.definition_id
                                AND T1.unit_code = T4.condition_unit_code
         WHERE T1.bus_no = #{busNo}
           AND T5.status_enum = #{completed}
-          AND T1.delete_flag = 0
+          AND T1.delete_flag = '0'
     </select>
     <select id="selectChargeDetail" resultType="com.openhis.web.inventorymanage.dto.ItemChargeDetailDto">
         SELECT T1.id AS definition_id,
@@ -99,7 +99,7 @@
                T3.unit_code,
                T3.min_unit_code
         FROM adm_charge_item_definition AS T1
-            LEFT JOIN adm_charge_item_def_app AS T2
+            LEFT JOIN adm_charge_item_def_detail AS T2
                 ON T1.id = T2.definition_id
             LEFT JOIN med_medication_definition AS T3
                 ON T1.instance_id = T3.id

openhis-server/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.chargemanage.mapper.OutpatientChargeAppMapper">
+
+    <select id="selectEncounterPatientPage"
+            resultType="com.openhis.web.chargemanage.dto.EncounterPatientPageDto">
+        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}
+    </select>
+</mapper>

openhis-server/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.outpatientservice.mapper.OutpatientRegistrationAppMapper">
+<mapper namespace="com.openhis.web.chargemanage.mapper.OutpatientRegistrationAppMapper">
 
-    <select id="getPractitionerMetadataPage" resultType="com.openhis.web.outpatientservice.dto.PractitionerMetadata">
+    <select id="getPractitionerMetadataPage" resultType="com.openhis.web.chargemanage.dto.PractitionerMetadata">
         SELECT T3.tenant_id,
                T3.ID,
                T3.NAME,
@@ -39,7 +39,7 @@
           AND create_time > CURRENT_DATE
     </select>
 
-    <select id="getCurrentDayEncounter" resultType="com.openhis.web.outpatientservice.dto.CurrentDayEncounterDto">
+    <select id="getCurrentDayEncounter" resultType="com.openhis.web.chargemanage.dto.CurrentDayEncounterDto">
         SELECT T9.tenant_id,
                T9.encounter_id,
                T9.organization_id,

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_value,
-        T5.condition_yb_code,
+        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_value,
-        T2.condition_yb_code,
+        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_value,
-        T5.condition_yb_code,
+        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_value,
-        T2.condition_yb_code,
+        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_value,
-        T5.condition_yb_code,
+        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_value,
-        T2.condition_yb_code,
+        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

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";
     }
 
     /**

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;
+
 }