Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis

# Conflicts:
#	openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryInitDto.java

openhis-server/core-common/src/main/java/com/core/common/core/domain/entity/SysUser.java

@@ -7,6 +7,7 @@ import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -22,6 +23,7 @@ import com.core.common.xss.Xss;
  * 
  * @author system
  */
+@Data
 public class SysUser extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -91,6 +93,12 @@ public class SysUser extends BaseEntity {
     /** 角色ID */
     private Long roleId;
 
+    /** 租户ID */
+    private Integer tenantId;
+
+    /** 删除标识 */
+    private String deleteFlag;
+
     public SysUser() {
 
     }

openhis-server/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java

@@ -3,13 +3,14 @@ package com.core.common.core.domain.model;
 import java.util.Collection;
 import java.util.Set;
 
-import lombok.Data;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.core.common.core.domain.entity.SysUser;
 
+import lombok.Data;
+
 /**
  * 登录用户身份权限
  * 
@@ -72,6 +73,16 @@ public class LoginUser implements UserDetails {
     /** 租户ID */
     private Integer tenantId;
 
+    /**
+     * 机构/科室id
+     */
+    private Long orgId;
+
+    /**
+     * 参与者id
+     */
+    private Long practitionerId;
+
     /**
      * 用户信息
      */

openhis-server/core-common/src/main/java/com/core/common/core/domain/model/LoginUserExtend.java

@@ -0,0 +1,21 @@
+package com.core.common.core.domain.model;
+
+import lombok.Data;
+
+/**
+ * 登录用户扩展
+ */
+@Data
+public class LoginUserExtend {
+
+    /**
+     * 机构/科室id
+     */
+    private Long orgId;
+
+    /**
+     * 参与者id
+     */
+    private Long practitionerId;
+
+}

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

@@ -1,5 +1,17 @@
 package com.core.framework.config;
 
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
@@ -8,15 +20,9 @@ import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInt
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
 import com.core.common.utils.SecurityUtils;
+
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.LongValue;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
 
 @EnableTransactionManagement(proxyTargetClass = true)
 @Configuration
@@ -81,56 +87,19 @@ public class MybatisPlusConfig {
             }
 
             // 配置需要租户隔离的表名集合
-            private static final Set<String> TENANT_TABLES = new HashSet<>(Arrays.asList(
+            private static final Set<String> TENANT_TABLES = new HashSet<>(Arrays.asList("adm_account",
-                    "adm_account",
+                "adm_charge_item", "adm_charge_item_def_detail", "adm_charge_item_definition", "adm_device",
-                    "adm_charge_item",
+                "adm_device_definition", "adm_encounter", "adm_encounter_diagnosis", "adm_encounter_location",
-                    "adm_charge_item_def_detail",
+                "adm_encounter_participant", "adm_encounter_reason", "adm_healthcare_service", "adm_invoice",
-                    "adm_charge_item_definition",
+                "adm_location", "adm_organization", "adm_organization_location", "adm_patient",
-                    "adm_device",
+                "adm_patient_identifier", "sys_user", "adm_practitioner", "adm_practitioner_role", "adm_supplier",
-                    "adm_device_definition",
+                "cli_condition", "cli_condition_definition", "cli_diagnosis_belong_binding", "cli_procedure",
-                    "adm_encounter",
+                "cli_procedure_performer", "doc_emr", "doc_emr_template", "doc_emr_detail", "doc_emr_dict", "fin_claim",
-                    "adm_encounter_diagnosis",
+                "fin_claim_response", "fin_contract", "fin_payment_notice", "fin_payment_rec_detail",
-                    "adm_encounter_location",
+                "fin_payment_reconciliation", "med_medication", "med_medication_definition", "med_medication_dispense",
-                    "adm_encounter_participant",
+                "med_medication_request", "wor_activity_definition", "wor_device_dispense", "wor_device_request",
-                    "adm_encounter_reason",
+                "wor_inventory_item", "wor_service_request", "wor_service_request_detail", "wor_supply_delivery",
-                    "adm_healthcare_service",
+                "wor_supply_request"));
-                    "adm_invoice",
-                    "adm_location",
-                    "adm_organization",
-                    "adm_organization_location",
-                    "adm_patient",
-                    "adm_patient_identifier",
-                    "adm_practitioner",
-                    "adm_practitioner_role",
-                    "adm_supplier",
-                    "cli_condition",
-                    "cli_condition_definition",
-                    "cli_diagnosis_belong_binding",
-                    "cli_procedure",
-                    "cli_procedure_performer",
-                    "doc_emr",
-                    "doc_emr_template",
-                    "doc_emr_detail",
-                    "doc_emr_dict",
-                    "fin_claim",
-                    "fin_claim_response",
-                    "fin_contract",
-                    "fin_payment_notice",
-                    "fin_payment_rec_detail",
-                    "fin_payment_reconciliation",
-                    "med_medication",
-                    "med_medication_definition",
-                    "med_medication_dispense",
-                    "med_medication_request",
-                    "wor_activity_definition",
-                    "wor_device_dispense",
-                    "wor_device_request",
-                    "wor_inventory_item",
-                    "wor_service_request",
-                    "wor_service_request_detail",
-                    "wor_supply_delivery",
-                    "wor_supply_request"
-            ));
 
             @Override
             public boolean ignoreTable(String tableName) {
@@ -147,10 +116,24 @@ public class MybatisPlusConfig {
      * 获取当前租户 ID
      */
     private Integer getCurrentTenantId() {
+        // // 尝试从请求头中获取租户ID
+        ServletRequestAttributes attributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
+        if (attributes != null) {
+            HttpServletRequest request = attributes.getRequest();
+            // 从请求头获取租户ID，假设header名称为"X-Tenant-ID" ; 登录接口前端把租户id放到请求头里
+            String tenantIdHeader = request.getHeader("X-Tenant-ID");
+            String requestMethodName = request.getHeader("Request-Method-Name");
+            // 登录
+            if ("login".equals(requestMethodName)) {
+                if (tenantIdHeader != null && !tenantIdHeader.isEmpty()) {
+                    return Integer.parseInt(tenantIdHeader);
+                }
+            }
+        }
         // 获取当前登录用户的租户 ID
         if (SecurityUtils.getAuthentication() != null) {
             return SecurityUtils.getLoginUser().getTenantId();
         }
-        return 0;
+        return 0; // 默认租户ID
     }
 }

openhis-server/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java

@@ -1,6 +1,7 @@
 package com.core.framework.web.service;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -8,12 +9,15 @@ import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import com.core.common.constant.CacheConstants;
 import com.core.common.constant.Constants;
 import com.core.common.constant.UserConstants;
 import com.core.common.core.domain.entity.SysUser;
 import com.core.common.core.domain.model.LoginUser;
+import com.core.common.core.domain.model.LoginUserExtend;
 import com.core.common.core.redis.RedisCache;
 import com.core.common.exception.ServiceException;
 import com.core.common.exception.user.*;
@@ -88,11 +92,24 @@ public class SysLoginService {
             MessageUtils.message("user.login.success")));
         LoginUser loginUser = (LoginUser)authentication.getPrincipal();
 
-        // -----start-----登录时set租户id,正常应该从请求头获取,这行代码只是测试使用
+        // -----start-----登录时set租户id
-        loginUser.setTenantId(1);
+        Integer tenantId = 0;
-        // -----end-----登录时set租户id,正常应该从请求头获取,这行代码只是测试使用
+        ServletRequestAttributes attributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
-
+        if (attributes != null) {
+            HttpServletRequest request = attributes.getRequest();
+            // 从请求头获取租户ID，假设header名称为"X-Tenant-ID" ; 登录接口前端把租户id放到请求头里
+            String tenantIdHeader = request.getHeader("X-Tenant-ID");
+            if (tenantIdHeader != null && !tenantIdHeader.isEmpty()) {
+                tenantId = Integer.parseInt(tenantIdHeader);
+            }
+        }
+        loginUser.setTenantId(tenantId);
+        // -----end-----登录时set租户id
         recordLoginInfo(loginUser.getUserId());
+        // 设置 机构id和参与者id
+        LoginUserExtend loginUserExtend = userService.getLoginUserExtend(loginUser.getUserId());
+        loginUser.setOrgId(loginUserExtend.getOrgId());
+        loginUser.setPractitionerId(loginUserExtend.getPractitionerId());
         // 生成token
         return tokenService.createToken(loginUser);
     }

openhis-server/core-system/src/main/java/com/core/system/mapper/SysUserMapper.java

@@ -2,6 +2,7 @@ package com.core.system.mapper;
 
 import java.util.List;
 
+import com.core.common.core.domain.model.LoginUserExtend;
 import org.apache.ibatis.annotations.Param;
 
 import com.core.common.core.domain.entity.SysUser;
@@ -125,4 +126,12 @@ public interface SysUserMapper {
      * @return 结果
      */
     public SysUser checkEmailUnique(String email);
+
+    /**
+     * 扩展属性
+     *
+     * @param userId 系统用户id
+     * @return 扩展属性
+     */
+    LoginUserExtend getLoginUserExtend(@Param("userId") Long userId);
 }

openhis-server/core-system/src/main/java/com/core/system/service/ISysUserService.java

@@ -3,6 +3,7 @@ package com.core.system.service;
 import java.util.List;
 
 import com.core.common.core.domain.entity.SysUser;
+import com.core.common.core.domain.model.LoginUserExtend;
 
 /**
  * 用户 业务层
@@ -203,4 +204,12 @@ public interface ISysUserService {
      * @return 结果
      */
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+    /**
+     * 扩展属性
+     * 
+     * @param userId 系统用户id
+     * @return 扩展属性
+     */
+    LoginUserExtend getLoginUserExtend(Long userId);
 }

openhis-server/core-system/src/main/java/com/core/system/service/impl/SysUserServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
 
 import javax.validation.Validator;
 
+import com.core.common.core.domain.model.LoginUserExtend;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -484,4 +485,16 @@ public class SysUserServiceImpl implements ISysUserService {
         }
         return successMsg.toString();
     }
+
+    /**
+     * 扩展属性
+     *
+     * @param userId 系统用户id
+     * @return 扩展属性
+     */
+    @Override
+    public LoginUserExtend getLoginUserExtend(Long userId) {
+        return userMapper.getLoginUserExtend(userId);
+    }
+
 }

openhis-server/core-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -121,8 +121,18 @@
         <if test="roleKey != null and roleKey != ''">#{roleKey},</if>
         <if test="roleSort != null">#{roleSort},</if>
         <if test="dataScope != null and dataScope != ''">#{dataScope},</if>
-        <if test="menuCheckStrictly != null">#{menuCheckStrictly},</if>
+        <if test="menuCheckStrictly != null">
-        <if test="deptCheckStrictly != null">#{deptCheckStrictly},</if>
+            <choose>
+                <when test="menuCheckStrictly == true">1,</when>
+                <otherwise>0,</otherwise>
+            </choose>
+        </if>
+        <if test="deptCheckStrictly != null">
+            <choose>
+                <when test="deptCheckStrictly == true">1,</when>
+                <otherwise>0,</otherwise>
+            </choose>
+        </if>
         <if test="status != null and status != ''">#{status},</if>
         <if test="remark != null and remark != ''">#{remark},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
@@ -137,8 +147,18 @@
             <if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
             <if test="roleSort != null">role_sort = #{roleSort},</if>
             <if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>
-            <if test="menuCheckStrictly != null">menu_check_strictly = #{menuCheckStrictly},</if>
+            <if test="menuCheckStrictly != null">
-            <if test="deptCheckStrictly != null">dept_check_strictly = #{deptCheckStrictly},</if>
+                <choose>
+                    <when test="menuCheckStrictly == true">menu_check_strictly=1,</when>
+                    <otherwise>menu_check_strictly=0,</otherwise>
+                </choose>
+            </if>
+            <if test="deptCheckStrictly != null">
+                <choose>
+                    <when test="deptCheckStrictly == true">dept_check_strictly=1,</when>
+                    <otherwise>dept_check_strictly=0,</otherwise>
+                </choose>
+            </if>
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>

openhis-server/core-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -108,7 +108,7 @@
         </if>
         <if test="deptId != null and deptId != 0">
             AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE cast(#{deptId} as
-            varchar) = any(string_to_array(ancestors,‘,’)) ))
+            varchar) = any(string_to_array(ancestors,',')) ))
         </if>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
@@ -265,4 +265,12 @@
         </foreach>
     </delete>
 
+    <select id="getLoginUserExtend" resultType="com.core.common.core.domain.model.LoginUserExtend">
+        SELECT T1.ID     AS practitioner_id,
+               T1.org_id AS org_id
+        FROM adm_practitioner AS T1
+        WHERE T1.delete_flag = '0'
+          AND T1.user_id = #{userId} LIMIT 1
+    </select>
+
 </mapper> 

openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerAppService.java

@@ -1,47 +1,48 @@
 package com.openhis.web.basedatamanage.appservice;
 
-import javax.servlet.http.HttpServletRequest;
+import com.baomidou.mybatisplus.core.metadata.IPage;
-
 import com.core.common.core.domain.R;
-import com.openhis.web.basedatamanage.dto.PractSearchParam;
+import com.openhis.web.basedatamanage.dto.UserAndPractitionerDto;
-import com.openhis.web.basedatamanage.dto.PractitionerDto;
 
 /**
- * Practitioner 应该服务类
+ * 参与者 应该服务类
  */
 public interface IPractitionerAppService {
-    /**
-     * 查询员工信息
-     *
-     * @param pageNo 当前页码
-     * @param pageSize 查询条数
-     * @param request 请求数据
-     * @return 员工分页列表
-     */
-    R<?> getPractitionerPage(PractSearchParam practSearchParam, String searchKey, Integer pageNo, Integer pageSize,
-        HttpServletRequest request);
 
     /**
-     * 员工信息详情
+     * 新增用户及参与者
      * 
-     * @param practitionerId 员工信息id
+     * @param userAndPractitionerDto 用户及参与者dto
-     * @return 员工信息详情
+     * @return 结果
      */
-    R<?> getPractitionerById(Long practitionerId);
+    R<?> saveUserPractitioner(UserAndPractitionerDto userAndPractitionerDto);
 
     /**
-     * 添加/编辑员工信息
+     * 查询用户及参与者
      * 
-     * @param practitionerDto 员工信息
+     * @param userAndPractitionerDto 查询条件
-     * @return 操作结果
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @return 用户及参与者
      */
-    R<?> addOrEditPractitioner(PractitionerDto practitionerDto);
+    IPage<UserAndPractitionerDto> getUserPractitionerPage(UserAndPractitionerDto userAndPractitionerDto,
+        String searchKey, Integer pageNo, Integer pageSize);
 
     /**
-     * 员工信息
+     * 修改用户及参与者
      *
-     * @param practitionerId 员工信息id
+     * @param userAndPractitionerDto 用户及参与者dto
-     * @return 操作结果
+     * @return 结果
      */
-    R<?> deletePractitioner(Long practitionerId);
+    R<?> editUserPractitioner(UserAndPractitionerDto userAndPractitionerDto);
+
+    /**
+     * 删除用户及参与者 ; admin不允许删除
+     *
+     * @param userId 系统用户id
+     * @return 结果
+     */
+    R<?> delUserPractitioner(Long userId);
+
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java

@@ -2,116 +2,310 @@ package com.openhis.web.basedatamanage.appservice.impl;
 
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
 
-import javax.servlet.http.HttpServletRequest;
+import javax.annotation.Resource;
 
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.ChineseConvertUtils;
 import com.core.common.utils.MessageUtils;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.administration.domain.BizUser;
+import com.openhis.administration.domain.BizUserRole;
 import com.openhis.administration.domain.Practitioner;
 import com.openhis.administration.domain.PractitionerRole;
-import com.openhis.administration.mapper.PractitionerMapper;
+import com.openhis.administration.service.IBizUserRoleService;
+import com.openhis.administration.service.IBizUserService;
 import com.openhis.administration.service.IPractitionerRoleService;
 import com.openhis.administration.service.IPractitionerService;
 import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.utils.HisPageUtils;
+import com.openhis.common.enums.AccountStatus;
+import com.openhis.common.enums.PractitionerRoles;
 import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.basedatamanage.appservice.IPractitionerAppService;
-import com.openhis.web.basedatamanage.dto.PractSearchParam;
+import com.openhis.web.basedatamanage.dto.PractitionerOrgAndLocationDto;
-import com.openhis.web.basedatamanage.dto.PractitionerDto;
+import com.openhis.web.basedatamanage.dto.PractitionerRolesDto;
+import com.openhis.web.basedatamanage.dto.UserAndPractitionerDto;
+import com.openhis.web.basedatamanage.mapper.PractitionerAppAppMapper;
 
 @Service
 public class PractitionerAppServiceImpl implements IPractitionerAppService {
 
-    @Autowired
+    @Resource
-    private IPractitionerService practitionerService;
+    PractitionerAppAppMapper practitionerAppAppMapper;
 
-    @Autowired
+    @Resource
-    private PractitionerMapper practitionerMapper;
+    IBizUserService iBizUserService;
 
-    @Autowired
+    @Resource
-    private IPractitionerRoleService practitionerRoleService;
+    IBizUserRoleService iBizUserRoleService;
 
-    @Override
+    @Resource
-    public R<?> getPractitionerPage(PractSearchParam practSearchParam, String searchKey, Integer pageNo,
+    IPractitionerService iPractitionerService;
-        Integer pageSize, HttpServletRequest request) {
 
-        // 构建查询条件
+    @Resource
-        QueryWrapper<Practitioner> queryWrapper = HisQueryUtils.buildQueryWrapper(practSearchParam, searchKey,
+    IPractitionerRoleService iPractitionerRoleService;
-            new HashSet<>(Arrays.asList("name", "py_str", "wb_str")), request);
-
-        // 查询员工分页列表
-        Page<PractitionerDto> practitionerDtoPage =
-            HisPageUtils.selectPage(practitionerMapper, queryWrapper, pageNo, pageSize, PractitionerDto.class);
-
-        return R.ok(practitionerDtoPage,
-            MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"员工信息"}));
-    }
 
     /**
-     * 员工信息详情
+     * 新增用户及参与者
      *
-     * @param practitionerId 员工信息id
+     * @param userAndPractitionerDto 用户及参与者dto
-     * @return 员工信息详情
+     * @return 结果
      */
     @Override
-    public R<?> getPractitionerById(Long practitionerId) {
+    public R<?> saveUserPractitioner(UserAndPractitionerDto userAndPractitionerDto) {
-        Practitioner practitioner = practitionerService.getById(practitionerId);
+        String userName = userAndPractitionerDto.getUserName();
-        if (practitioner != null) {
+        String nickName = userAndPractitionerDto.getNickName();
-            return R.ok(practitioner,
+        String phonenumber = userAndPractitionerDto.getPhonenumber();
-                MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"员工信息"}));
+        String sex = userAndPractitionerDto.getSex();
-        } else {
+        // 账号唯一性
-            return R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, new Object[] {"员工信息查询失败"}));
+        long count = iBizUserService.count(new LambdaQueryWrapper<BizUser>().eq(BizUser::getUserName, userName));
+        if (count > 0L) {
+            return R.fail(null, "账号已存在");
         }
+        // 新增 sys_user
+        BizUser bizUser = new BizUser();
+        bizUser.setUserName(userName); // 账号
+        bizUser.setNickName(nickName); // 昵称
+        bizUser.setEmail(userAndPractitionerDto.getEmail());// 邮箱
+        bizUser.setPhonenumber(phonenumber); // 电话
+        bizUser.setSex(sex); // 性别
+        bizUser.setPassword(SecurityUtils.encryptPassword(userAndPractitionerDto.getPassword())); // 密码
+        bizUser.setStatus(userAndPractitionerDto.getStatus()); // 状态
+        bizUser.setRemark(userAndPractitionerDto.getRemark()); // 备注
+        iBizUserService.save(bizUser);
+        Long userId =
+            iBizUserService.getOne(new LambdaQueryWrapper<BizUser>().eq(BizUser::getUserName, userName)).getUserId(); // 用户id
+        // 新增 sys_user_role
+        List<PractitionerRolesDto> practitionerRoleDtoList = userAndPractitionerDto.getPractitionerRolesDtoList();
+        BizUserRole bizUserRole;
+        for (PractitionerRolesDto practitionerRolesDto : practitionerRoleDtoList) {
+            bizUserRole = new BizUserRole();
+            bizUserRole.setUserId(userId);
+            bizUserRole.setRoleId(practitionerRolesDto.getRoleId());
+            iBizUserRoleService.save(bizUserRole);
         }
-
+        // 新增 adm_practitioner
-    /**
-     * 添加/编辑员工信息
-     *
-     * @param practitionerDto 员工信息
-     * @return 操作结果
-     */
-    @Override
-    public R<?> addOrEditPractitioner(PractitionerDto practitionerDto) {
-
         Practitioner practitioner = new Practitioner();
-        BeanUtils.copyProperties(practitionerDto, practitioner);
+        practitioner.setActiveFlag(AccountStatus.ACTIVE.getValue()); // 活动标记
-        PractitionerRole practitionerRole = new PractitionerRole();
+        practitioner.setName(nickName); // 姓名
-
+        practitioner.setGenderEnum(Integer.parseInt(sex)); // 性别
-        if (practitionerDto.getId() != null) {
+        practitioner.setBirthDate(userAndPractitionerDto.getBirthDate()); // 出生日期
-            // 更新员工信息
+        practitioner.setPhone(phonenumber); // 电话
-            practitionerService.updateById(practitioner);
+        practitioner.setAddress(userAndPractitionerDto.getAddress()); // 地址
-        } else {
+        practitioner.setYbNo(userAndPractitionerDto.getYbNo()); // 医保码
-            // 新增员工信息
+        practitioner.setUserId(userId); // 系统用户id
-            practitionerService.save(practitioner);
+        // 责任科室
-
+        List<PractitionerOrgAndLocationDto> responsibilityOrgDtoList =
-            // 新增员工岗位信息
+            userAndPractitionerDto.getResponsibilityOrgDtoList();
-            practitionerRole.setPractitionerId(practitioner.getId());
+        practitioner.setOrgId(responsibilityOrgDtoList.get(0).getOrgId()); // 机构id
-            practitionerRole.setName(practitioner.getName());
+        practitioner.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(nickName)); // 拼音码
-            practitionerRoleService.save(practitionerRole);
+        practitioner.setWbStr(ChineseConvertUtils.toWBFirstLetter(nickName)); // 五笔码
+        iPractitionerService.save(practitioner);
+        Long practitionerId = practitioner.getId();// 参与者id
+        // 新增 adm_practitioner_role
+        PractitionerRole practitionerRole;
+        // 1.责任科室
+        for (PractitionerOrgAndLocationDto responsibilityOrgDto : responsibilityOrgDtoList) {
+            practitionerRole = new PractitionerRole();
+            practitionerRole.setName(nickName); // 姓名
+            practitionerRole.setPractitionerId(practitionerId); // 参与者id
+            practitionerRole.setOrgId(responsibilityOrgDto.getOrgId()); // 机构id
+            iPractitionerRoleService.save(practitionerRole);
         }
-        // 返回员工id
+        // 2.医生出诊科室
-        return R.ok(practitioner.getId(),
+        List<PractitionerOrgAndLocationDto> doctorVisitOrgDtoList = userAndPractitionerDto.getDoctorVisitOrgDtoList();
-            MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"员工信息更新添加"}));
+        for (PractitionerOrgAndLocationDto doctorVisitOrgDto : doctorVisitOrgDtoList) {
+            practitionerRole = new PractitionerRole();
+            practitionerRole.setName(nickName); // 姓名
+            practitionerRole.setPractitionerId(practitionerId); // 参与者id
+            practitionerRole.setRoleCode(PractitionerRoles.DOCTOR.getCode());// 角色code
+            practitionerRole.setOrgId(doctorVisitOrgDto.getOrgId()); // 机构id
+            iPractitionerRoleService.save(practitionerRole);
+        }
+        // 3.管理库房
+        List<PractitionerOrgAndLocationDto> manageLocationDtoList = userAndPractitionerDto.getManageLocationDtoList();
+        for (PractitionerOrgAndLocationDto manageLocationDto : manageLocationDtoList) {
+            practitionerRole = new PractitionerRole();
+            practitionerRole.setName(nickName); // 姓名
+            practitionerRole.setPractitionerId(practitionerId); // 参与者id
+            practitionerRole.setRoleCode(PractitionerRoles.LOCATION_ADMIN.getCode()); // 角色code
+            practitionerRole.setLocationId(manageLocationDto.getLocationId()); // 位置id
+            practitionerRole.setOrgId(manageLocationDto.getOrgId()); // 机构id
+            iPractitionerRoleService.save(practitionerRole);
+        }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[] {"人员信息"}));
     }
 
     /**
-     * 删除员工
+     * 查询用户及参与者
      *
-     * @param practitionerId 员工信息id
+     * @param userAndPractitionerDto 查询条件
-     * @return 操作结果
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @return 用户及参与者
      */
     @Override
-    public R<?> deletePractitioner(Long practitionerId) {
+    public IPage<UserAndPractitionerDto> getUserPractitionerPage(UserAndPractitionerDto userAndPractitionerDto,
-        // 删除员工信息
+        String searchKey, Integer pageNo, Integer pageSize) {
-        boolean deletepractitioner = practitionerService.removeById(practitionerId);
+        // 构建查询条件
-        return deletepractitioner
+        QueryWrapper<UserAndPractitionerDto> queryWrapper = HisQueryUtils.buildQueryWrapper(userAndPractitionerDto,
-            ? R.ok(practitionerId, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[] {"员工信息"}))
+            searchKey, new HashSet<>(Arrays.asList("user_name", "nick_name", "py_str", "wb_str")), null);
-            : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, new Object[] {"员工信息"}));
+        queryWrapper.orderByDesc("user_id");
+        IPage<UserAndPractitionerDto> userPractitionerPage =
+            practitionerAppAppMapper.getUserPractitionerPage(new Page<>(pageNo, pageSize), queryWrapper);
+        List<UserAndPractitionerDto> records = userPractitionerPage.getRecords();
+        // 参与者id集合
+        List<Long> practitionerIdList =
+            records.stream().map(UserAndPractitionerDto::getPractitionerId).collect(Collectors.toList());
+        // 角色集合
+        List<PractitionerRolesDto> practitionerRolesDtoList =
+            practitionerAppAppMapper.getPractitionerRolesDtoList(practitionerIdList);
+        // 科室和位置
+        List<PractitionerOrgAndLocationDto> orgAndLocationDtoList =
+            practitionerAppAppMapper.getOrgAndLocationDtoList(practitionerIdList);
+        for (UserAndPractitionerDto record : records) {
+            // 匹配角色
+            List<PractitionerRolesDto> list1 = practitionerRolesDtoList.stream()
+                .filter(e -> e.getPractitionerId().equals(record.getPractitionerId())).collect(Collectors.toList());
+            record.setPractitionerRolesDtoList(list1);
+            // 匹配责任科室
+            List<PractitionerOrgAndLocationDto> list2 = orgAndLocationDtoList.stream()
+                .filter(e -> e.getPractitionerId().equals(record.getPractitionerId()) && "".equals(e.getRoleCode()))
+                .collect(Collectors.toList());
+            record.setResponsibilityOrgDtoList(list2);
+            // 匹配医生出诊科室
+            List<PractitionerOrgAndLocationDto> list3 =
+                orgAndLocationDtoList.stream().filter(e -> e.getPractitionerId().equals(record.getPractitionerId())
+                    && PractitionerRoles.DOCTOR.getCode().equals(e.getRoleCode())).collect(Collectors.toList());
+            record.setDoctorVisitOrgDtoList(list3);
+            // 匹配管理库房
+            List<PractitionerOrgAndLocationDto> list4 =
+                orgAndLocationDtoList.stream()
+                    .filter(e -> e.getPractitionerId().equals(record.getPractitionerId())
+                        && PractitionerRoles.LOCATION_ADMIN.getCode().equals(e.getRoleCode()))
+                    .collect(Collectors.toList());
+            record.setManageLocationDtoList(list4);
         }
+        return userPractitionerPage;
+    }
+
+    /**
+     * 修改用户及参与者 : 登录账号和密码不允许编辑
+     *
+     * @param userAndPractitionerDto 用户及参与者dto
+     * @return 结果
+     */
+    @Override
+    public R<?> editUserPractitioner(UserAndPractitionerDto userAndPractitionerDto) {
+        Long userId = userAndPractitionerDto.getUserId(); // 系统用户id
+        Long practitionerId = userAndPractitionerDto.getPractitionerId(); // 参与者id
+
+        String nickName = userAndPractitionerDto.getNickName();
+        String phonenumber = userAndPractitionerDto.getPhonenumber();
+        String sex = userAndPractitionerDto.getSex();
+        // 编辑 sys_user
+        BizUser bizUser = new BizUser();
+        bizUser.setNickName(nickName); // 昵称
+        bizUser.setEmail(userAndPractitionerDto.getEmail());// 邮箱
+        bizUser.setPhonenumber(phonenumber); // 电话
+        bizUser.setSex(sex); // 性别
+        bizUser.setStatus(userAndPractitionerDto.getStatus()); // 状态
+        bizUser.setRemark(userAndPractitionerDto.getRemark()); // 备注
+        iBizUserService.update(bizUser, new LambdaQueryWrapper<BizUser>().eq(BizUser::getUserId, userId));
+        // 先删除,再新增 sys_user_role
+        practitionerAppAppMapper.delUserRole(userId);
+        List<PractitionerRolesDto> practitionerRoleDtoList = userAndPractitionerDto.getPractitionerRolesDtoList();
+        BizUserRole bizUserRole;
+        for (PractitionerRolesDto practitionerRolesDto : practitionerRoleDtoList) {
+            bizUserRole = new BizUserRole();
+            bizUserRole.setUserId(userId);
+            bizUserRole.setRoleId(practitionerRolesDto.getRoleId());
+            iBizUserRoleService.save(bizUserRole);
+        }
+        // 编辑 adm_practitioner
+        Practitioner practitioner = new Practitioner();
+        practitioner.setId(practitionerId);
+        practitioner.setName(nickName); // 姓名
+        practitioner.setGenderEnum(Integer.parseInt(sex)); // 性别
+        practitioner.setBirthDate(userAndPractitionerDto.getBirthDate()); // 出生日期
+        practitioner.setPhone(phonenumber); // 电话
+        practitioner.setAddress(userAndPractitionerDto.getAddress()); // 地址
+        practitioner.setYbNo(userAndPractitionerDto.getYbNo()); // 医保码
+        practitioner.setUserId(userId); // 系统用户id
+        // 责任科室
+        List<PractitionerOrgAndLocationDto> responsibilityOrgDtoList =
+            userAndPractitionerDto.getResponsibilityOrgDtoList();
+        practitioner.setOrgId(responsibilityOrgDtoList.get(0).getOrgId()); // 机构id
+        practitioner.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(nickName)); // 拼音码
+        practitioner.setWbStr(ChineseConvertUtils.toWBFirstLetter(nickName)); // 五笔码
+        iPractitionerService.updateById(practitioner);
+        // 先删除,再新增 adm_practitioner_role
+        practitionerAppAppMapper.delPractitionerRole(practitionerId);
+        PractitionerRole practitionerRole;
+        // 1.责任科室
+        for (PractitionerOrgAndLocationDto responsibilityOrgDto : responsibilityOrgDtoList) {
+            practitionerRole = new PractitionerRole();
+            practitionerRole.setName(nickName); // 姓名
+            practitionerRole.setPractitionerId(practitionerId); // 参与者id
+            practitionerRole.setOrgId(responsibilityOrgDto.getOrgId()); // 机构id
+            iPractitionerRoleService.save(practitionerRole);
+        }
+        // 2.医生出诊科室
+        List<PractitionerOrgAndLocationDto> doctorVisitOrgDtoList = userAndPractitionerDto.getDoctorVisitOrgDtoList();
+        for (PractitionerOrgAndLocationDto doctorVisitOrgDto : doctorVisitOrgDtoList) {
+            practitionerRole = new PractitionerRole();
+            practitionerRole.setName(nickName); // 姓名
+            practitionerRole.setPractitionerId(practitionerId); // 参与者id
+            practitionerRole.setRoleCode(PractitionerRoles.DOCTOR.getCode());// 角色code
+            practitionerRole.setOrgId(doctorVisitOrgDto.getOrgId()); // 机构id
+            iPractitionerRoleService.save(practitionerRole);
+        }
+        // 3.管理库房
+        List<PractitionerOrgAndLocationDto> manageLocationDtoList = userAndPractitionerDto.getManageLocationDtoList();
+        for (PractitionerOrgAndLocationDto manageLocationDto : manageLocationDtoList) {
+            practitionerRole = new PractitionerRole();
+            practitionerRole.setName(nickName); // 姓名
+            practitionerRole.setPractitionerId(practitionerId); // 参与者id
+            practitionerRole.setRoleCode(PractitionerRoles.LOCATION_ADMIN.getCode()); // 角色code
+            practitionerRole.setLocationId(manageLocationDto.getLocationId()); // 位置id
+            practitionerRole.setOrgId(manageLocationDto.getOrgId()); // 机构id
+            iPractitionerRoleService.save(practitionerRole);
+        }
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"人员信息"}));
+    }
+
+    /**
+     * 删除用户及参与者 ; admin不允许删除
+     *
+     * @param userId 系统用户id
+     * @return 结果
+     */
+    @Override
+    public R<?> delUserPractitioner(Long userId) {
+        if (1L == userId) {
+            return R.fail(null, "admin不允许删除");
+        }
+        iBizUserService.remove(new LambdaQueryWrapper<BizUser>().eq(BizUser::getUserId, userId));
+        practitionerAppAppMapper.delUserRole(userId);
+        Practitioner one =
+            iPractitionerService.getOne(new LambdaQueryWrapper<Practitioner>().eq(Practitioner::getUserId, userId));
+        Long practitionerId = one.getId();// 参与者id
+        iPractitionerService.removeById(practitionerId);
+        iPractitionerRoleService
+            .remove(new LambdaQueryWrapper<PractitionerRole>().eq(PractitionerRole::getPractitionerId, practitionerId));
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[] {"人员信息"}));
+    }
+
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerController.java

@@ -3,25 +3,18 @@
  */
 package com.openhis.web.basedatamanage.controller;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
 import com.openhis.web.basedatamanage.appservice.IPractitionerAppService;
-import com.openhis.web.basedatamanage.dto.PractSearchParam;
+import com.openhis.web.basedatamanage.dto.UserAndPractitionerDto;
-import com.openhis.web.basedatamanage.dto.PractitionerDto;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 /**
- * 员工管理Controller业务层处理
+ * 参与者 Controller业务层处理
- *
- * @author
- * @date 2025-02-21
  */
 @RestController
 @RequestMapping("/base-data-manage/practitioner")
@@ -29,54 +22,72 @@ import lombok.extern.slf4j.Slf4j;
 @AllArgsConstructor
 public class PractitionerController {
 
-    @Autowired
+    private final IPractitionerAppService practitionerAppService;
-    private IPractitionerAppService practitionerAppService;
 
     /**
-     * 员工分页列表
+     * 新增用户及参与者
      * 
-     * @param practSearchParam 查询条件
+     * @param userAndPractitionerDto 用户及参与者dto
-     * @param pageNo 当前页码
+     * @return 结果
-     * @param pageSize 查询条数
-     * @param request 请求数据
-     * @return 员工分页列表
      */
-    @GetMapping(value = "/practitioner")
+    @PostMapping(value = "/user-practitioner")
-    public R<?> getPractitionerPage(PractSearchParam practSearchParam,
+    public R<?> saveUserPractitioner(@RequestBody UserAndPractitionerDto userAndPractitionerDto) {
+        return practitionerAppService.saveUserPractitioner(userAndPractitionerDto);
+    }
+
+    /**
+     * 查询用户及参与者
+     * 
+     * @param userAndPractitionerDto 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @return 用户及参与者
+     */
+    @GetMapping(value = "/user-practitioner-page")
+    public R<?> getUserPractitionerPage(UserAndPractitionerDto userAndPractitionerDto,
         @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
-        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
-        return practitionerAppService.getPractitionerPage(practSearchParam, searchKey, pageNo, pageSize, request);
+        return R
+            .ok(practitionerAppService.getUserPractitionerPage(userAndPractitionerDto, searchKey, pageNo, pageSize));
     }
 
     /**
-     * 获取员工需要编辑的信息
+     * 查询用户及参与者详情
      * 
-     * @param practitionerId 员工信息
+     * @param userId 系统用户id
+     * @return 用户及参与者详情
      */
-    @GetMapping("/practitioner-getById")
+    @GetMapping(value = "/user-practitioner-detail")
-    public R<?> getPractitionerById(@Validated @RequestParam Long practitionerId) {
+    public R<?> getUserPractitionerPage(@RequestParam Long userId) {
-        return practitionerAppService.getPractitionerById(practitionerId);
+        UserAndPractitionerDto userAndPractitionerDto = new UserAndPractitionerDto();
+        userAndPractitionerDto.setUserId(userId);
+        IPage<UserAndPractitionerDto> userPractitionerPage =
+            practitionerAppService.getUserPractitionerPage(userAndPractitionerDto, "", 1, 1);
+        return R.ok(userPractitionerPage.getRecords().get(0));
     }
 
     /**
-     * 编辑员工信息
+     * 修改用户及参与者
      *
-     * @param practitionerDto 员工信息
+     * @param userAndPractitionerDto 用户及参与者dto
+     * @return 结果
      */
-    @PutMapping("/practitioner")
+    @PutMapping(value = "/user-practitioner")
-    public R<?> addOrEditPractitioner(@Validated @RequestBody PractitionerDto practitionerDto) {
+    public R<?> editUserPractitioner(@RequestBody UserAndPractitionerDto userAndPractitionerDto) {
-        return practitionerAppService.addOrEditPractitioner(practitionerDto);
+        return practitionerAppService.editUserPractitioner(userAndPractitionerDto);
     }
 
     /**
-     * 删除员工信息
+     * 删除用户及参与者 ; admin不允许删除
      * 
-     * @param practitionerId 主表id
+     * @param userId 系统用户id
+     * @return 结果
      */
-    @DeleteMapping("/practitioner")
+    @DeleteMapping(value = "/user-practitioner")
-    public R<?> deletePractitioner(@RequestParam Long practitionerId) {
+    public R<?> delUserPractitioner(@RequestParam Long userId) {
-        return practitionerAppService.deletePractitioner(practitionerId);
+        return practitionerAppService.delUserPractitioner(userId);
     }
 
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryDto.java

@@ -35,8 +35,8 @@ public class OrgLocQueryDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long defLocationId;
 
-    /** 药品类别 */
+    /** 发放类别 */
-    private String medCategoryCode;
+    private String distributionCategoryCode;
 
     /** 开始时间 */
     private Date startTime;

openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerOrgAndLocationDto.java

@@ -0,0 +1,44 @@
+package com.openhis.web.basedatamanage.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 参与者机构和位置 dto
+ */
+@Data
+@Accessors(chain = true)
+public class PractitionerOrgAndLocationDto {
+
+    /**
+     * 位置id
+     */
+    @Dict(dictTable = "adm_location", dictCode = "id", dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+    private String locationId_dictText;
+
+    /**
+     * 角色code
+     */
+    private String roleCode;
+
+    /**
+     * 机构id
+     */
+    @Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+    private String orgId_dictText;
+
+    /**
+     * 参与者id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long practitionerId;
+
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRolesDto.java

@@ -0,0 +1,38 @@
+package com.openhis.web.basedatamanage.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 参与者角色 dto
+ */
+@Data
+@Accessors(chain = true)
+public class PractitionerRolesDto {
+
+    /**
+     * 角色id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long roleId;
+
+    /**
+     * 角色code
+     */
+    private String roleCode;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 参与者id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long practitionerId;
+
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/UserAndPractitionerDto.java

@@ -0,0 +1,125 @@
+package com.openhis.web.basedatamanage.dto;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 用户 及 参与者 dto
+ */
+@Data
+@Accessors(chain = true)
+public class UserAndPractitionerDto {
+
+    /**
+     * 用户id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userId;
+
+    /**
+     * 参与者id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long practitionerId;
+
+    /**
+     * 账号
+     */
+    private String userName;
+
+    /**
+     * 姓名
+     */
+    private String nickName;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 五笔码 */
+    private String wbStr;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 电话
+     */
+    private String phonenumber;
+
+    /**
+     * 性别
+     */
+    @Dict(dictCode = "sys_user_sex")
+    private String sex;
+    private String sex_dictText;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    @Dict(dictCode = "sys_normal_disable")
+    private String status;
+    private String status_dictText;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 出生日期
+     */
+    private Date birthDate;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 医保码
+     */
+    private String ybNo;
+
+    /**
+     * 机构id
+     */
+    @Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+    private String orgId_dictText;
+
+    /**
+     * 责任科室
+     */
+    private List<PractitionerOrgAndLocationDto> responsibilityOrgDtoList;
+
+    /**
+     * 参与者角色集合
+     */
+    private List<PractitionerRolesDto> practitionerRolesDtoList;
+
+    /**
+     * 医生出诊科室集合
+     */
+    private List<PractitionerOrgAndLocationDto> doctorVisitOrgDtoList;
+
+    /**
+     * 管理库房集合
+     */
+    private List<PractitionerOrgAndLocationDto> manageLocationDtoList;
+
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/mapper/PractitionerAppAppMapper.java

@@ -0,0 +1,63 @@
+package com.openhis.web.basedatamanage.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+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.basedatamanage.dto.PractitionerOrgAndLocationDto;
+import com.openhis.web.basedatamanage.dto.PractitionerRolesDto;
+import com.openhis.web.basedatamanage.dto.UserAndPractitionerDto;
+
+/**
+ * 参与者 应用Mapper
+ */
+@Repository
+public interface PractitionerAppAppMapper {
+
+    /**
+     * 查询用户及参与者
+     * 
+     * @param page 分页参数
+     * @param queryWrapper 查询条件
+     * @return 用户及参与者
+     */
+    IPage<UserAndPractitionerDto> getUserPractitionerPage(@Param("page") Page<UserAndPractitionerDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<UserAndPractitionerDto> queryWrapper);
+
+    /**
+     * 查询参与者的角色信息
+     * 
+     * @param practitionerIdList 参与者id集合
+     * @return 参与者的角色信息
+     */
+    List<PractitionerRolesDto> getPractitionerRolesDtoList(@Param("practitionerIdList") List<Long> practitionerIdList);
+
+    /**
+     * 查询科室和位置集合
+     * 
+     * @param practitionerIdList 参与者id集合
+     * @return 科室和位置集合
+     */
+    List<PractitionerOrgAndLocationDto>
+        getOrgAndLocationDtoList(@Param("practitionerIdList") List<Long> practitionerIdList);
+
+    /**
+     * 物理删除系统用户与角色的关系
+     * 
+     * @param userId 系统用户id
+     */
+    void delUserRole(@Param("userId") Long userId);
+
+    /**
+     * 物理删除参与者与业务角色的关系
+     * 
+     * @param practitionerId 参与者id
+     */
+    void delPractitionerRole(@Param("practitionerId") Long practitionerId);
+
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java

@@ -132,8 +132,8 @@ public class HealthcareServiceController {
      * @param id 主键
      * @return 详情
      */
-    @GetMapping(value = "/healthcare-service-detail/{id}")
+    @GetMapping(value = "/healthcare-service-detail")
-    public R<?> getHealthcareServiceDetail(@PathVariable("id") Long id) {
+    public R<?> getHealthcareServiceDetail(@RequestParam Long id) {
         HealthcareServiceDto healthcareServiceDto = new HealthcareServiceDto();
         healthcareServiceDto.setId(id);
         // 构建查询条件

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientChargeAppService.java

@@ -52,4 +52,11 @@ public interface IOutpatientChargeAppService {
      * @return 操作结果
      */
     R<?> changeToMedicalInsurance(Long encounterId);
+
+    /**
+     * 门诊收费页面初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> outpatientChargeInit();
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRefundAppService.java

@@ -3,10 +3,13 @@
  */
 package com.openhis.web.chargemanage.appservice;
 
-import com.core.common.core.domain.R;
-
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.chargemanage.dto.EncounterPatientPageParam;
+
 /**
  * 门诊退费 service
  *
@@ -30,4 +33,24 @@ public interface IOutpatientRefundAppService {
      * @return 操作结果
      */
     R<?> refundPayment(List<Long> paymentIdList);
+
+    /**
+     * 查询结算过的就诊患者分页列表
+     *
+     * @param encounterPatientPageParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @param request 请求
+     * @return 就诊患者分页列表
+     */
+    R<?> getBilledEncounterPatientPage(EncounterPatientPageParam encounterPatientPageParam, String searchKey,
+        Integer pageNo, Integer pageSize, HttpServletRequest request);
+
+    /**
+     * 门诊退费页面初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> outpatientRefundInit();
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java

@@ -3,8 +3,10 @@
  */
 package com.openhis.web.chargemanage.appservice.impl;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -28,6 +30,7 @@ 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.dto.OutpatientInitDto;
 import com.openhis.web.chargemanage.mapper.OutpatientChargeAppMapper;
 
 /**
@@ -46,6 +49,25 @@ public class OutpatientChargeAppServiceImpl implements IOutpatientChargeAppServi
     @Autowired
     private IAccountService accountService;
 
+    /**
+     * 门诊收费页面初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> outpatientChargeInit() {
+        OutpatientInitDto initDto = new OutpatientInitDto();
+        List<OutpatientInitDto.chargeItemStatusOption> chargeItemStatusOptions = new ArrayList<>();
+        chargeItemStatusOptions.add(new OutpatientInitDto.chargeItemStatusOption(ChargeItemStatus.PLANNED.getValue(),
+            ChargeItemStatus.PLANNED.getInfo()));
+        chargeItemStatusOptions.add(new OutpatientInitDto.chargeItemStatusOption(ChargeItemStatus.BILLABLE.getValue(),
+            ChargeItemStatus.BILLABLE.getInfo()));
+        chargeItemStatusOptions.add(new OutpatientInitDto.chargeItemStatusOption(ChargeItemStatus.BILLED.getValue(),
+            ChargeItemStatus.BILLED.getInfo()));
+        initDto.setChargeItemStatusOptions(chargeItemStatusOptions);
+        return R.ok(initDto);
+    }
+
     /**
      * 查询就诊患者分页列表
      *

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java

@@ -3,24 +3,34 @@
  */
 package com.openhis.web.chargemanage.appservice.impl;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
-import java.util.stream.Collectors;
 
-import com.openhis.web.chargemanage.dto.RefundItemDto;
+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.core.common.utils.MessageUtils;
-import com.openhis.administration.domain.ChargeItem;
 import com.openhis.administration.service.IChargeItemService;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.PaymentStatus;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.financial.service.IPaymentReconciliationService;
+import com.openhis.medication.service.IMedicationDispenseService;
 import com.openhis.web.chargemanage.appservice.IOutpatientRefundAppService;
-import com.openhis.web.chargemanage.dto.EncounterPatientPaymentDto;
+import com.openhis.web.chargemanage.dto.*;
 import com.openhis.web.chargemanage.mapper.OutpatientRefundAppMapper;
+import com.openhis.workflow.service.IDeviceDispenseService;
+import com.openhis.workflow.service.IServiceRequestService;
 
 /**
  * 门诊退费 impl
@@ -37,6 +47,33 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
     private IPaymentReconciliationService paymentReconciliationService;
     @Autowired
     private IChargeItemService chargeItemService;
+    @Autowired
+    private IMedicationDispenseService medicationDispenseService;
+    @Autowired
+    private IDeviceDispenseService deviceDispenseService;
+    @Autowired
+    private IServiceRequestService serviceRequestService;
+
+    /**
+     * 门诊退费页面初始化
+     *
+     * @return 初始化信息
+     */
+    @Override
+    public R<?> outpatientRefundInit() {
+        OutpatientInitDto initDto = new OutpatientInitDto();
+        List<OutpatientInitDto.chargeItemStatusOption> chargeItemStatusOptions = new ArrayList<>();
+        chargeItemStatusOptions.add(new OutpatientInitDto.chargeItemStatusOption(ChargeItemStatus.BILLED.getValue(),
+            ChargeItemStatus.BILLED.getInfo()));
+        chargeItemStatusOptions.add(new OutpatientInitDto.chargeItemStatusOption(ChargeItemStatus.REFUNDING.getValue(),
+            ChargeItemStatus.REFUNDING.getInfo()));
+        chargeItemStatusOptions.add(new OutpatientInitDto.chargeItemStatusOption(ChargeItemStatus.REFUNDED.getValue(),
+            ChargeItemStatus.REFUNDED.getInfo()));
+        chargeItemStatusOptions.add(new OutpatientInitDto.chargeItemStatusOption(
+            ChargeItemStatus.PART_REFUND.getValue(), ChargeItemStatus.PART_REFUND.getInfo()));
+        initDto.setChargeItemStatusOptions(chargeItemStatusOptions);
+        return R.ok(initDto);
+    }
 
     /**
      * 根据就诊id查询患者的账单
@@ -60,29 +97,98 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
      */
     @Override
     public R<?> refundPayment(List<Long> paymentIdList) {
-
+        // todo：医生同意退费（审批流）
-     List<RefundItemDto> refundItemList = outpatientRefundAppMapper.selectRefundItem(paymentIdList, CommonConstants.TableName.MED_MEDICATION_REQUEST,
-            CommonConstants.TableName.WOR_SERVICE_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
-            CommonConstants.Common.THREE);
-
-        // 医生同意退费
-        // 查询所有的chargeid，对应生成一个负的chargeitem
-        // 根据每个 chargeitem判断对应的服务，药品，耗材是否已发放执行
-        // 若已发放/执行需要对应的发药人/执行人审批（药品耗材需要先退药）
-        for (Long paymentId : paymentIdList) {
         // 根据支付id获取对应收费项目的id列表
-            List<Long> chargeItemIdList = paymentReconciliationService.getChargeItemIdListByPayment(paymentId);
+        List<Long> chargeItemIdList = paymentReconciliationService.getChargeItemIdListByPayment(paymentIdList);
-            if (chargeItemIdList == null) {
+
-                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006, null));
+        // 根据收费项目id列表查询退费项
+        List<RefundItemDto> refundItemList = outpatientRefundAppMapper.selectRefundItem(chargeItemIdList,
+            CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_SERVICE_REQUEST,
+            CommonConstants.TableName.WOR_DEVICE_REQUEST, CommonConstants.Common.THREE);
+
+        List<Long> medDisIdList = new ArrayList<>();
+        List<Long> devDisIdList = new ArrayList<>();
+        List<Long> serReqIdList = new ArrayList<>();
+
+        for (RefundItemDto refundItem : refundItemList) {
+            if (CommonConstants.TableName.MED_MEDICATION_REQUEST.equals(refundItem.getServiceTable())) {
+
+                // 药品需要先退药
+                if (DispenseStatus.COMPLETED.getValue().equals(refundItem.getRefundStatus())
+                    || DispenseStatus.PART_COMPLETED.getValue().equals(refundItem.getRefundStatus())) {
+                    return R
+                        .fail(MessageUtils.createMessage(PromptMsgConstant.ChargeRefund.M00001, new Object[] {"药品"}));
+                } else {
+                    // todo:审批流药师同意退费
+                    medDisIdList.add(refundItem.getDispenseId());
+                }
+            } else if (CommonConstants.TableName.WOR_SERVICE_REQUEST.equals(refundItem.getServiceTable())) {
+                // 诊疗项目需医技科室同意退费
+                if (RequestStatus.COMPLETED.getValue().equals(refundItem.getRefundStatus())) {
+                    return R.fail(MessageUtils.createMessage(PromptMsgConstant.ChargeRefund.M00002, null));
+                } else {
+                    // todo:审批流医技师同意退费
+                    serReqIdList.add(refundItem.getServiceId());
+                }
+            } else if (CommonConstants.TableName.WOR_DEVICE_REQUEST.equals(refundItem.getServiceTable())) {
+                // 耗材需要先退药
+                if (DispenseStatus.COMPLETED.getValue().equals(refundItem.getRefundStatus())
+                    || DispenseStatus.PART_COMPLETED.getValue().equals(refundItem.getRefundStatus())) {
+                    return R
+                        .fail(MessageUtils.createMessage(PromptMsgConstant.ChargeRefund.M00001, new Object[] {"耗材"}));
+                } else {
+                    devDisIdList.add(refundItem.getDispenseId());
+                }
+            }
+        }
+        // 更新收费状态：已退费
+        chargeItemService.updateRefundChargeStatus(chargeItemIdList);
+        // 更新未发放药品状态：停止发放，停止原因：退费
+        medicationDispenseService.updateStopDispenseStatus(medDisIdList, NotPerformedReason.REFUND.getValue());
+        // 更新未发放耗材状态：停止发放，停止原因：退费
+        deviceDispenseService.updateStopDispenseStatus(devDisIdList, NotPerformedReason.REFUND.getValue());
+        // 更新执行诊疗状态：停止
+        serviceRequestService.updateStopRequestStatus(serReqIdList);
+        // 返回退费成功信息
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"处方退费"}));
     }
 
-            // 根据收费项目id列表获取收费信息
+    /**
-            List<ChargeItem> chargeItemList = chargeItemService.getChargeItemInfo(chargeItemIdList);
+     * 查询结算过的就诊患者分页列表
+     *
+     * @param encounterPatientPageParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @param request 请求
+     * @return 就诊患者分页列表
+     */
+    @Override
+    public R<?> getBilledEncounterPatientPage(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 = outpatientRefundAppMapper.selectBilledEncounterPatientPage(
+            new Page<>(pageNo, pageSize), queryWrapper, ChargeItemStatus.BILLED.getValue(),
+            ChargeItemStatus.REFUNDING.getValue(), ChargeItemStatus.REFUNDED.getValue(),
+            ChargeItemStatus.PART_REFUND.getValue(), AccountType.MEDICAL_INSURANCE.getValue());
 
-            List<String> prescriptionNoList =
+        encounterPatientPage.getRecords().forEach(e -> {
-                chargeItemList.stream().map(ChargeItem::getPrescriptionNo).collect(Collectors.toList());
+            // 性别枚举
-
+            e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
-        }
+            // 收费状态枚举
-        return null;
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(ChargeItemStatus.class, e.getStatusEnum()));
+            // 计算年龄
+            e.setAge(AgeCalculatorUtil.getAge(e.getBirthDate()));
+            // 合同类型枚举
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(ContractCategory.class, e.getCategoryEnum()));
+        });
+        return R.ok(encounterPatientPage);
     }
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java

@@ -23,7 +23,7 @@ import com.openhis.administration.service.*;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.*;
-import com.openhis.common.enums.PractitionerRole;
+import com.openhis.common.enums.PractitionerRoles;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisPageUtils;
 import com.openhis.common.utils.HisQueryUtils;
@@ -142,7 +142,7 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
             new HashSet<>(Arrays.asList("name", "py_str", "wb_str")), null);
         IPage<PractitionerMetadata> practitionerMetadataPage =
             outpatientRegistrationAppMapper.getPractitionerMetadataPage(new Page<>(pageNo, pageSize), locationId,
-                PractitionerRole.DOCTOR.getCode(), queryWrapper);
+                PractitionerRoles.DOCTOR.getCode(), queryWrapper);
         practitionerMetadataPage.getRecords().forEach(e -> {
             // 性别
             e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
@@ -211,11 +211,13 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
         EncounterLocation encounterLocation = new EncounterLocation();
         BeanUtils.copyProperties(encounterLocationFormData, encounterLocation);
         iEncounterLocationService.saveEncounterLocationByRegister(encounterLocation);
-        // 保存就诊参数者信息
+        // 保存就诊参数者信息 , 选了参与这才保存
+        if (encounterParticipantFormData.getPractitionerId() != null) {
             encounterParticipantFormData.setEncounterId(encounterId);
             EncounterParticipant encounterParticipant = new EncounterParticipant();
             BeanUtils.copyProperties(encounterParticipantFormData, encounterParticipant);
             iEncounterParticipantService.saveEncounterParticipantByRegister(encounterParticipant);
+        }
         // 保存就诊账户信息
         accountFormData.setEncounterId(encounterId);
         Account account = new Account();

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientChargeController.java

@@ -30,6 +30,16 @@ public class OutpatientChargeController {
     @Autowired
     private IOutpatientChargeAppService outpatientChargeAppService;
 
+    /**
+     * 门诊收费页面初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> outpatientChargeInit() {
+        return outpatientChargeAppService.outpatientChargeInit();
+    }
+
     /**
      * 查询就诊患者分页列表
      *

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRefundController.java

@@ -3,17 +3,20 @@
  */
 package com.openhis.web.chargemanage.controller;
 
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import com.core.common.core.domain.R;
 import com.openhis.web.chargemanage.appservice.IOutpatientRefundAppService;
+import com.openhis.web.chargemanage.dto.EncounterPatientPageParam;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.List;
-
 /**
  * 门诊退费 controller
  *
@@ -29,6 +32,35 @@ public class OutpatientRefundController {
     @Autowired
     private IOutpatientRefundAppService outpatientRefundAppService;
 
+    /**
+     * 门诊退费页面初始化
+     *
+     * @return 初始化信息
+     */
+    @GetMapping(value = "/init")
+    public R<?> outpatientRefundInit() {
+        return outpatientRefundAppService.outpatientRefundInit();
+    }
+
+    /**
+     * 查询结算过的就诊患者分页列表
+     *
+     * @param encounterPatientPageParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @param request 请求
+     * @return 就诊患者分页列表
+     */
+    @GetMapping(value = "/encounter-patient-page")
+    public R<?> getBilledEncounterPatientPage(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(outpatientRefundAppService.getBilledEncounterPatientPage(encounterPatientPageParam, searchKey,
+            pageNo, pageSize, request));
+    }
+
     /**
      * 根据就诊id查询患者的账单
      *

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java

@@ -84,7 +84,7 @@ public class OutpatientRegistrationController {
     @GetMapping(value = "/location-tree")
     public R<?> getLocationTree(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
-        return R.ok(iLocationAppService.getLocationTree(LocationForm.ROOM.getValue(), pageNo, pageSize));
+        return iLocationAppService.getLocationTree(LocationForm.ROOM.getValue(), pageNo, pageSize);
 
     }
 

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/AccountFormData.java

@@ -2,6 +2,8 @@ package com.openhis.web.chargemanage.dto;
 
 import java.math.BigDecimal;
 
+import javax.validation.constraints.NotNull;
+
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.enums.AccountBillingStatus;
@@ -24,6 +26,7 @@ public class AccountFormData {
     private Long encounterId;
 
     /** 患者id */
+    @NotNull(message = "患者id不能为空")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long patientId;
 
@@ -34,6 +37,7 @@ public class AccountFormData {
     private Integer billingStatusEnum;
 
     /** 账户类型编码 */
+    @NotNull(message = "账户类型不能为空")
     private String typeCode; // 1:个人现金账户, 2:医保账户
 
     /** 名称 */

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java

@@ -3,6 +3,8 @@ package com.openhis.web.chargemanage.dto;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import javax.validation.constraints.NotNull;
+
 import com.core.common.utils.SecurityUtils;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -27,6 +29,7 @@ public class ChargeItemFormData {
     private Long encounterId;
 
     /** 患者id */
+    @NotNull(message = "患者id不能为空")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long patientId;
 
@@ -47,6 +50,7 @@ public class ChargeItemFormData {
     private Long performerId;
 
     /** 费用定价ID */
+    @NotNull(message = "费用定价ID不能为空")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long definitionId;
 
@@ -61,10 +65,12 @@ public class ChargeItemFormData {
     private String serviceTable;
 
     /** 医疗服务ID */
+    @NotNull(message = "医疗服务ID不能为空")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long serviceId;
 
     /** 总价 */
+    @NotNull(message = "总价不能为空")
     private BigDecimal totalPrice;
 
     /** 关联账户ID */
@@ -78,8 +84,8 @@ public class ChargeItemFormData {
         this.statusEnum = ChargeItemStatus.BILLED.getValue();
         this.contextEnum = EncounterClass.AMB.getValue();
         this.occurrenceTime = new Date();
-        this.performerId = SecurityUtils.getLoginUser().getUserId();
+        this.performerId = SecurityUtils.getLoginUser().getPractitionerId();
-        this.entererId = SecurityUtils.getLoginUser().getUserId();
+        this.entererId = SecurityUtils.getLoginUser().getPractitionerId();
         this.enteredDate = new Date();
         this.serviceTable = CommonConstants.TableName.ADM_HEALTHCARE_SERVICE;
     }

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterFormData.java

@@ -1,5 +1,7 @@
 package com.openhis.web.chargemanage.dto;
 
+import javax.validation.constraints.NotNull;
+
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.enums.*;
@@ -7,8 +9,6 @@ import com.openhis.common.enums.*;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * 就诊 表单数据
  */
@@ -19,7 +19,7 @@ public class EncounterFormData {
     /**
      * 患者ID
      */
-    @NotBlank(message = "患者ID不能为空")
+    @NotNull(message = "患者ID不能为空")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long patientId;
 
@@ -41,7 +41,7 @@ public class EncounterFormData {
     /**
      * 优先级编码
      */
-    @NotBlank(message = "优先级编码不能为空")
+    @NotNull(message = "优先级编码不能为空")
     private Integer priorityEnum;
 
     /**
@@ -52,7 +52,7 @@ public class EncounterFormData {
     /**
      * 服务ID
      */
-    @NotBlank(message = "服务ID不能为空")
+    @NotNull(message = "服务ID不能为空")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long serviceTypeId;
 
@@ -64,7 +64,7 @@ public class EncounterFormData {
     /**
      * 机构ID
      */
-    @NotBlank(message = "机构ID不能为空")
+    @NotNull(message = "机构ID不能为空")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long organizationId;
 

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterLocationFormData.java

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * 就诊位置 表单数据
@@ -26,7 +27,7 @@ public class EncounterLocationFormData {
     /**
      * 位置ID
      */
-    @NotBlank(message = "位置ID不能为空")
+    @NotNull(message = "位置ID不能为空")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long locationId;
 

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterParticipantFormData.java

@@ -1,6 +1,6 @@
 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;
@@ -26,7 +26,6 @@ public class EncounterParticipantFormData {
     private String typeCode;
 
     /** 参与者ID */
-    @NotBlank(message = "参与者ID不能为空")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long practitionerId;
 

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java

@@ -3,12 +3,12 @@
  */
 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 com.openhis.common.annotation.Dict;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -21,9 +21,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-public class EncounterPatientPageDto implements Serializable {
+public class EncounterPatientPageDto {
-
-    private static final long serialVersionUID = 1L;
 
     /**
      * 就诊ID
@@ -75,7 +73,9 @@ public class EncounterPatientPageDto implements Serializable {
     /**
      * 账户类型编码
      */
+    @Dict(dictCode = "account_code")
     private String typeCode;
+    private String typeCode_dictText;
 
     /**
      * 账户余额
@@ -95,4 +95,28 @@ public class EncounterPatientPageDto implements Serializable {
     /** 收费状态 */
     private Integer statusEnum;
     private String statusEnum_enumText;
+
+    /**
+     * 医保总额
+     */
+    private BigDecimal insurancePrice;
+
+    /**
+     * 自费总额
+     */
+    private BigDecimal selfPrice;
+
+    /**
+     * 付款总额
+     */
+    private BigDecimal totalAmount;
+
+    /** 合同类型 */
+    private Integer categoryEnum;
+    private String categoryEnum_enumText;
+
+    /**
+     * 结算时间
+     */
+    private Date billDate;
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java

@@ -3,7 +3,6 @@
  */
 package com.openhis.web.chargemanage.dto;
 
-import java.io.Serializable;
 import java.util.Date;
 
 import lombok.Data;
@@ -17,9 +16,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-public class EncounterPatientPageParam implements Serializable {
+public class EncounterPatientPageParam {
-
-    private static final long serialVersionUID = 1L;
 
     /**
      * 患者姓名
@@ -56,6 +53,11 @@ public class EncounterPatientPageParam implements Serializable {
      */
     private Date startTime;
 
+    /**
+     * 收费时间
+     */
+    private Date billTime;
+
     /**
      * 收费状态
      */

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPaymentDto.java

@@ -3,7 +3,6 @@
  */
 package com.openhis.web.chargemanage.dto;
 
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -24,9 +23,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-public class EncounterPatientPaymentDto implements Serializable {
+public class EncounterPatientPaymentDto {
-
-    private static final long serialVersionUID = 1L;
 
     /** ID */
     @TableId(type = IdType.ASSIGN_ID)

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java

@@ -3,7 +3,6 @@
  */
 package com.openhis.web.chargemanage.dto;
 
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -18,9 +17,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-public class EncounterPatientPrescriptionDto implements Serializable {
+public class EncounterPatientPrescriptionDto {
-
-    private static final long serialVersionUID = 1L;
 
     /** 收费项目类型 */
     private Integer contextEnum;

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientInitDto.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.chargemanage.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 门诊费用相关初始化
+ *
+ * @author zwh
+ * @date 2025-03-30
+ */
+@Data
+@Accessors(chain = true)
+public class OutpatientInitDto {
+
+    private List<OutpatientInitDto.chargeItemStatusOption> chargeItemStatusOptions;
+
+    /**
+     * 收费状态
+     */
+    @Data
+    public static class chargeItemStatusOption {
+        private Integer value;
+        private String label;
+
+        public chargeItemStatusOption(Integer value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationAddParam.java

@@ -1,5 +1,7 @@
 package com.openhis.web.chargemanage.dto;
 
+import javax.validation.Valid;
+
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -13,6 +15,7 @@ public class OutpatientRegistrationAddParam {
     /**
      * 就诊管理-表单数据
      */
+    @Valid
     private EncounterFormData encounterFormData;
 
     // /**
@@ -23,20 +26,24 @@ public class OutpatientRegistrationAddParam {
     /**
      * 就诊位置管理-表单数据
      */
+    @Valid
     private EncounterLocationFormData encounterLocationFormData;
 
     /**
      * 就诊参数者管理-表单数据
      */
+    @Valid
     private EncounterParticipantFormData encounterParticipantFormData;
 
     /**
      * 就诊账户管理-表单数据
      */
+    @Valid
     private AccountFormData accountFormData;
     /**
      * 费用项管理-表单数据
      */
+    @Valid
     private ChargeItemFormData chargeItemFormData;
 
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java

@@ -3,8 +3,6 @@
  */
 package com.openhis.web.chargemanage.dto;
 
-import java.io.Serializable;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -16,7 +14,35 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-public class RefundItemDto implements Serializable {
+public class RefundItemDto {
 
-    private static final long serialVersionUID = 1L;
+    /** 收费ID */
+    private Long chargeId;
+
+    /** 医疗服务所在表 */
+    private String serviceTable;
+
+    /** 医疗服务ID */
+    private Long serviceId;
+
+    /** 请求编码 */
+    private String busNo;
+
+    /** 请求数量 */
+    private Integer quantity;
+
+    /** 请求单位编码 */
+    private String unitCode;
+
+    /** 退款状态 */
+    private Integer refundStatus;
+
+    /** 项目id */
+    private Long itemId;
+
+    /** 发放id */
+    private Long dispenseId;
+
+    /** 项目名 */
+    private Long itemName;
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRefundAppMapper.java

@@ -8,6 +8,11 @@ import java.util.List;
 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;
 import com.openhis.web.chargemanage.dto.EncounterPatientPaymentDto;
 import com.openhis.web.chargemanage.dto.RefundItemDto;
 
@@ -36,15 +41,32 @@ public interface OutpatientRefundAppMapper {
     /**
      * 查询退费项目
      * 
-     * @param paymentIdList 支付编号列表
+     * @param chargeItemIdList 收费项列表
      * @param medMedicationRequest 药品请求表
      * @param worServiceRequest 服务请求表
      * @param worDeviceRequest 耗材请求表
      * @param three 用于字符截位
      * @return 退费项目列表
      */
-    List<RefundItemDto> selectRefundItem(@Param("paymentIdList") List<Long> paymentIdList,
+    List<RefundItemDto> selectRefundItem(@Param("chargeItemIdList") List<Long> chargeItemIdList,
         @Param("medMedicationRequest") String medMedicationRequest,
         @Param("worServiceRequest") String worServiceRequest, @Param("worDeviceRequest") String worDeviceRequest,
         @Param("three") Integer three);
+
+    /**
+     * 查询已结算就诊患者分页列表
+     *
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @param billed 收费状态：已结算
+     * @param refunding 收费状态：退费中
+     * @param refunded 收费状态：已退费
+     * @param partRefund 收费状态：部分退费
+     * @param insurance 账户类型：医保
+     * @return 已结算就诊患者分页列表
+     */
+    Page<EncounterPatientPageDto> selectBilledEncounterPatientPage(@Param("page") Page<EncounterPatientPageDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<EncounterPatientPageParam> queryWrapper, @Param("billed") Integer billed,
+        @Param("refunding") Integer refunding, @Param("refunded") Integer refunded,
+        @Param("partRefund") Integer partRefund, @Param("insurance") Integer insurance);
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDeviceManageAppService.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import com.core.common.core.domain.R;
 import com.openhis.web.datadictionary.dto.DeviceManageSelParam;
 import com.openhis.web.datadictionary.dto.DeviceManageUpDto;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * 器材目录 service
@@ -63,7 +64,7 @@ public interface IDeviceManageAppService {
      * @param id 查询条件
      * @return 器材目录查询结果
      */
-    R<?> getDeviceOne(@PathVariable("id") Long id);
+    R<?> getDeviceOne(@RequestParam Long id);
 
     /**
      * 器材目录停用

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiagnosisTreatmentManageAppService.java

@@ -0,0 +1,86 @@
+package com.openhis.web.datadictionary.appservice;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
+import com.openhis.web.datadictionary.dto.DiagnosisTreatmentUpDto;
+
+/**
+ * 诊疗目录
+ *
+ * @author liuhr
+ * @date 2025/3/28
+ */
+public interface IDiagnosisTreatmentManageAppService {
+
+    /**
+     * 诊疗目录初期查询
+     *
+     * @return
+     */
+    R<?> getDiseaseTreatmentInit();
+
+    /**
+     * 查询诊疗目录分页列表
+     *
+     * @param DiagnosisTreatmentSelParam 查询条件
+     * @param searchKey 查询条件-模糊查询
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return
+     */
+    R<?> getDiseaseTreatmentPage(DiagnosisTreatmentSelParam DiagnosisTreatmentSelParam,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request);
+
+    /**
+     * 根据id查询诊疗详情
+     *
+     * @param id 诊疗ID
+     * @return
+     */
+    R<?> getDiseaseTreatmentOne(Long id);
+
+    /**
+     * 诊疗目录编辑
+     *
+     * @param diagnosisTreatmentUpDto 诊疗目录列表
+     * @return
+     */
+    R<?> editDiseaseTreatment(DiagnosisTreatmentUpDto diagnosisTreatmentUpDto);
+
+    /**
+     * 诊疗目录停用
+     *
+     * @param ids 诊疗目录ID列表
+     * @return
+     */
+    R<?> editDiseaseTreatmentStop(List<Long> ids);
+
+    /**
+     * 诊疗目录启用
+     *
+     * @param ids 诊疗目录ID列表
+     * @return
+     */
+    R<?> editDiseaseTreatmentStart(List<Long> ids);
+
+    /**
+     * 新增外来诊疗目录
+     *
+     * @param diagnosisTreatmentUpDto 诊疗目录
+     * @return
+     */
+    @PostMapping("/information")
+    R<?> addDiseaseTreatment(DiagnosisTreatmentUpDto diagnosisTreatmentUpDto);
+
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiseaseManageAppService.java

@@ -0,0 +1,80 @@
+package com.openhis.web.datadictionary.appservice;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.bind.annotation.GetMapping;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.datadictionary.dto.DiseaseManageSelParam;
+import com.openhis.web.datadictionary.dto.DiseaseManageUpDto;
+
+/**
+ * 病种目录
+ *
+ * @author liuhr
+ * @date 2025/3/30
+ */
+public interface IDiseaseManageAppService {
+
+    /**
+     * 病种目录初始化
+     *
+     * @return
+     */
+    R<?> getDiseaseInit();
+
+    /**
+     * 查询病种目录分页列表
+     *
+     * @param diseaseManageSelParam 查询条件
+     * @param searchKey 查询条件-模糊查询
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return
+     */
+    R<?> getDiseaseList(DiseaseManageSelParam diseaseManageSelParam, String searchKey, Integer pageNo, Integer pageSize,
+        HttpServletRequest request);
+
+    /**
+     * 根据id查询疾病详情
+     *
+     * @param id 疾病ID
+     * @return
+     */
+    R<?> getDiseaseOne(Long id);
+
+    /**
+     * 病种目录编辑
+     *
+     * @param diseaseManageDto 病种目录列表
+     * @return
+     */
+    R<?> editDisease(DiseaseManageUpDto diseaseManageDto);
+
+    /**
+     * 病种目录停用
+     *
+     * @param ids 病种目录ID列表
+     * @return
+     */
+    R<?> editDiseaseStop(List<Long> ids);
+
+    /**
+     * 病种目录启用
+     *
+     * @param ids 病种目录ID列表
+     * @return
+     */
+    R<?> editDiseaseStart(List<Long> ids);
+
+    /**
+     * 新增外来病种目录
+     *
+     * @param diseaseManageUpDto 病种目录
+     * @return
+     */
+    R<?> addDisease(DiseaseManageUpDto diseaseManageUpDto);
+
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IItemDefinitionService.java

@@ -0,0 +1,32 @@
+package com.openhis.web.datadictionary.appservice;
+
+import com.openhis.administration.domain.ChargeItemDefinition;
+import com.openhis.administration.domain.DeviceDefinition;
+import com.openhis.medication.domain.MedicationDetail;
+import com.openhis.web.datadictionary.dto.DeviceManageUpDto;
+import com.openhis.web.datadictionary.dto.ItemUpFromDirectoryDto;
+import com.openhis.web.datadictionary.dto.MedicationManageUpDto;
+
+/**
+ * 项目定价
+ *
+ * @author liuhr
+ * @date 2025/3/25
+ */
+public interface IItemDefinitionService {
+
+    /**
+     * 添加药品/器材/诊疗的项目定价
+     *
+     * @param itemUpFromDirectoryDto 药品/器材/诊疗目录信息
+     */
+    boolean addItem(ItemUpFromDirectoryDto itemUpFromDirectoryDto);
+
+    /**
+     * 修改项目定价表
+     *
+     * @param chargeItemDefinition 项目定价表信息
+     */
+    boolean updateItem(ChargeItemDefinition chargeItemDefinition);
+
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IMedicationManageAppService.java

@@ -8,6 +8,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.openhis.web.datadictionary.dto.MedicationSearchParam;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -32,14 +33,11 @@ public interface IMedicationManageAppService {
      * 药品目录查询
      *
      * @param searchKey 查询条件
-     * @param ybMatchFlag 查询条件-是否对码
-     * @param statusEnum 查询条件-状态
-     * @param categoryCode 查询条件-药品分类
      * @param pageNo 当前页码
      * @param pageSize 查询条数
      * @return 药品目录查询结果
      */
-    R<?> getMedicationList(String searchKey, Integer ybMatchFlag, Integer statusEnum, String categoryCode,
+    R<?> getMedicationList(MedicationSearchParam medicationSearchParam,String searchKey,
         Integer pageNo, Integer pageSize, HttpServletRequest request);
 
     /**
@@ -48,7 +46,7 @@ public interface IMedicationManageAppService {
      * @param id 查询条件
      * @return 药品目录查询结果
      */
-    R<?> getMedicationOne(@PathVariable("id") Long id);
+    R<?> getMedicationOne(@RequestParam Long id);
 
     /**
      * 编辑药品目录信息

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ISupplierManagementAppService.java

@@ -35,11 +35,12 @@ public interface ISupplierManagementAppService {
      *
      * @param supplierSearchParam 查询条件
      * @param searchKey 查询条件-模糊查询
+     * @param typeEnum 查询条件
      * @param pageNo 查询条件
      * @param pageSize 查询条件
      * @return 厂商/产地查询结果
      */
-    R<?> getSupplierList(SupplierSearchParam supplierSearchParam, String searchKey, Integer pageNo, Integer pageSize,
+    R<?> getSupplierList(SupplierSearchParam supplierSearchParam, String searchKey,Integer typeEnum, Integer pageNo, Integer pageSize,
         HttpServletRequest request);
 
     /**

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java

@@ -10,39 +10,44 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.openhis.administration.domain.Supplier;
+import com.openhis.administration.service.ISupplierService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.MessageUtils;
+import com.core.common.core.domain.entity.SysDictData;
+import com.core.common.utils.*;
 import com.core.common.utils.bean.BeanUtils;
+import com.core.system.service.ISysDictTypeService;
+import com.openhis.administration.domain.ChargeItemDefinition;
 import com.openhis.administration.domain.DeviceDefinition;
 import com.openhis.administration.domain.Organization;
 import com.openhis.administration.mapper.DeviceDefinitionMapper;
 import com.openhis.administration.service.IDeviceDefinitionService;
 import com.openhis.administration.service.IOrganizationService;
+import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.DeviceCategory;
+import com.openhis.common.enums.AssignSeqEnum;
 import com.openhis.common.enums.OrganizationType;
 import com.openhis.common.enums.PublicationStatus;
 import com.openhis.common.enums.Whether;
 import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisPageUtils;
 import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.datadictionary.appservice.IDeviceManageAppService;
-import com.openhis.web.datadictionary.dto.DeviceManageDto;
+import com.openhis.web.datadictionary.appservice.IItemDefinitionService;
-import com.openhis.web.datadictionary.dto.DeviceManageInitDto;
+import com.openhis.web.datadictionary.dto.*;
-import com.openhis.web.datadictionary.dto.DeviceManageSelParam;
+import com.openhis.web.datadictionary.mapper.DeviceManageMapper;
-import com.openhis.web.datadictionary.dto.DeviceManageUpDto;
 
 /**
  * 器材目录 impl
@@ -62,6 +67,21 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
     @Autowired
     private IOrganizationService organizationService;
 
+    @Resource
+    DeviceManageMapper deviceManageMapper;
+
+    @Autowired
+    private ISysDictTypeService sysDictTypeService;
+
+    @Autowired
+    private IItemDefinitionService itemDefinitionServic;
+
+    @Autowired
+    private ISupplierService supplierService;
+
+    @Autowired(required = false)
+    AssignSeqUtil assignSeqUtil;
+
     /**
      * 器材目录初始化
      *
@@ -69,25 +89,52 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
      */
     @Override
     public R<?> getDeviceManageInit() {
+
         DeviceManageInitDto deviceManageInitDto = new DeviceManageInitDto();
+
         // 获取状态
         List<DeviceManageInitDto.statusEnumOption> statusEnumOptions = Stream.of(PublicationStatus.values())
             .map(status -> new DeviceManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
             .collect(Collectors.toList());
         deviceManageInitDto.setStatusFlagOptions(statusEnumOptions);
-        // 获取执行科室
+
-        LambdaQueryWrapper<Organization> queryWrapper = new LambdaQueryWrapper<>();
+//        // 获取执行科室
-        queryWrapper.eq(Organization::getTypeEnum, OrganizationType.HOSPITAL_DEPARTMENT);
+//        LambdaQueryWrapper<Organization> queryWrapper = new LambdaQueryWrapper<>();
-        List<Organization> organizations = organizationService.list(queryWrapper);
+//        queryWrapper.eq(Organization::getTypeEnum, OrganizationType.HOSPITAL_DEPARTMENT);
-        List<DeviceManageInitDto.exeOrganization> exeOrganizations = organizations.stream()
+//        List<Organization> organizations = organizationService.list(queryWrapper);
-            .map(exeOrg -> new DeviceManageInitDto.exeOrganization(exeOrg.getId(), exeOrg.getName()))
+//        List<DeviceManageInitDto.exeOrganization> exeOrganizations = organizations.stream()
-            .collect(Collectors.toList());
+//            .map(exeOrg -> new DeviceManageInitDto.exeOrganization(exeOrg.getId(), exeOrg.getName()))
-        deviceManageInitDto.setExeOrganizations(exeOrganizations);
+//            .collect(Collectors.toList());
-        // 获取分类
+//        deviceManageInitDto.setExeOrganizations(exeOrganizations);
-        List<DeviceManageInitDto.deviceCategory> deviceCategories = Stream.of(DeviceCategory.values())
+        // // 从枚举中获取器材分类
-            .map(category -> new DeviceManageInitDto.deviceCategory(category.getValue(), category.getInfo()))
+        // List<DeviceManageInitDto.deviceCategory> deviceCategories = Stream.of(DeviceCategory.values())
+        // .map(category -> new DeviceManageInitDto.deviceCategory(category.getValue(), category.getInfo()))
+        // .collect(Collectors.toList());
+        // deviceManageInitDto.setDeviceCategories(deviceCategories);
+
+        // 获取器材
+        List<SysDictData> deviceList =
+            sysDictTypeService.selectDictDataByType(CommonConstants.DictName.DEVICE_CATEGORY_CODE);
+        // 从字典中获取器材分类
+        List<DeviceManageInitDto.dictCategoryCode> deviceCategories = deviceList.stream()
+            .map(category -> new DeviceManageInitDto.dictCategoryCode(category.getDictValue(), category.getDictLabel()))
             .collect(Collectors.toList());
         deviceManageInitDto.setDeviceCategories(deviceCategories);
+
+        // 获取医保是否对码
+        List<DeviceManageInitDto.statusEnumOption> statusYBWeatherOption = Stream.of(Whether.values())
+            .map(status -> new DeviceManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
+            .collect(Collectors.toList());
+        deviceManageInitDto.setStatusYBWeatherOptions(statusYBWeatherOption);
+
+        // 查询供应商列表
+        List<Supplier> supplierList = supplierService.getList();
+        // 供应商信息
+        List<DeviceManageInitDto.supplierListOption> supplierListOptions = supplierList.stream()
+            .map(supplier -> new DeviceManageInitDto.supplierListOption(supplier.getId(), supplier.getName()))
+            .collect(Collectors.toList());
+        deviceManageInitDto.setSupplierListOptions(supplierListOptions);
+
         return R.ok(deviceManageInitDto);
     }
 
@@ -107,14 +154,12 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
 
         // 构建查询条件
-        QueryWrapper<DeviceDefinition> queryWrapper = HisQueryUtils.buildQueryWrapper(deviceManageSelParam, searchKey,
+        QueryWrapper<DeviceManageDto> queryWrapper = HisQueryUtils.buildQueryWrapper(deviceManageSelParam, searchKey,
             new HashSet<>(Arrays.asList("bus_no", "name", "py_str", "wb_str")), request);
-        // 设置排序
-        queryWrapper.orderByAsc("bus_no");
 
         // 分页查询
-        Page<DeviceManageDto> deviceManagePage =
+        IPage<DeviceManageDto> deviceManagePage =
-            HisPageUtils.selectPage(deviceDefinitionMapper, queryWrapper, pageNo, pageSize, DeviceManageDto.class);
+            deviceManageMapper.getDevicePage(new Page<>(pageNo, pageSize), queryWrapper);
 
         deviceManagePage.getRecords().forEach(e -> {
             // 高值器材标志枚举类回显赋值
@@ -125,6 +170,11 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
             e.setYbMatchFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getYbMatchFlag()));
             // 过敏标记枚举类回显赋值
             e.setAllergenFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getAllergenFlag()));
+            // 器材分类
+            // e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(DeviceCategory.class, e.getCategoryEnum()));
+
+            // 器材状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(PublicationStatus.class, e.getStatusEnum()));
         });
 
         // 返回【器材目录列表DTO】分页
@@ -141,12 +191,25 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
 
         DeviceDefinition deviceDefinition = new DeviceDefinition();
         BeanUtils.copyProperties(deviceManageDto, deviceDefinition);
+        // 拼音码
+        deviceDefinition.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(deviceDefinition.getName()));
+        // 五笔码
+        deviceDefinition.setWbStr(ChineseConvertUtils.toWBFirstLetter(deviceDefinition.getName()));
 
         // 更新器材信息
-        return deviceDefinitionService.updateById(deviceDefinition)
+        if (deviceDefinitionService.updateById(deviceDefinition)) {
+            ChargeItemDefinition chargeItemDefinition = new ChargeItemDefinition();
+            chargeItemDefinition.setYbType(deviceManageDto.getYbType()).setTypeCode(deviceManageDto.getItemTypeCode())
+                .setInstanceTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION)
+                .setInstanceId(deviceDefinition.getId());
+
+            // 更新价格表
+            return itemDefinitionServic.updateItem(chargeItemDefinition)
                 ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"器材目录"}))
                 : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
         }
+        return R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    }
 
     /**
      * 器材目录详细查询
@@ -155,10 +218,14 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
      * @return 器材目录查询结果
      */
     @Override
-    public R<?> getDeviceOne(@PathVariable("id") Long id) {
+    public R<?> getDeviceOne(@RequestParam Long id) {
+
+        // 获取租户ID
+        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
         // 根据ID查询【器材目录】
-        DeviceDefinition byId = deviceDefinitionService.getById(id);
+        DeviceManageDto deviceManageDto = deviceManageMapper.getOne(id, tenantId);
-        return R.ok(byId);
+
+        return R.ok(deviceManageDto);
     }
 
     /**
@@ -176,7 +243,7 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
         for (Long detail : ids) {
             DeviceDefinition deviceDefinition = new DeviceDefinition();
             deviceDefinition.setId(detail);
-            deviceDefinition.setStatusEnum(PublicationStatus.RETIRED);
+            deviceDefinition.setStatusEnum(PublicationStatus.RETIRED.getValue());
             DeviceDefinitionList.add(deviceDefinition);
         }
 
@@ -201,7 +268,7 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
         for (Long detail : ids) {
             DeviceDefinition DeviceDefinition = new DeviceDefinition();
             DeviceDefinition.setId(detail);
-            DeviceDefinition.setStatusEnum(PublicationStatus.ACTIVE);
+            DeviceDefinition.setStatusEnum(PublicationStatus.ACTIVE.getValue());
             DeviceDefinitionList.add(DeviceDefinition);
         }
 
@@ -219,13 +286,35 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
     @Override
     public R<?> addDevice(@Validated @RequestBody DeviceManageUpDto deviceManageUpDto) {
 
-        DeviceDefinition DeviceDefinition = new DeviceDefinition();
+        DeviceDefinition deviceDefinition = new DeviceDefinition();
-        BeanUtils.copyProperties(deviceManageUpDto, DeviceDefinition);
+        BeanUtils.copyProperties(deviceManageUpDto, deviceDefinition);
+
+        // 使用10位数基础采番
+        String code = assignSeqUtil.getSeq(AssignSeqEnum.DEVICE_NUM.getPrefix(), 10);
+        deviceDefinition.setBusNo(code);
+        // 拼音码
+        deviceDefinition.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(deviceDefinition.getName()));
+        // 五笔码
+        deviceDefinition.setWbStr(ChineseConvertUtils.toWBFirstLetter(deviceDefinition.getName()));
 
         // 新增外来器材目录
-        DeviceDefinition.setStatusEnum(PublicationStatus.DRAFT);
+        deviceDefinition.setStatusEnum(PublicationStatus.DRAFT.getValue());
-        return deviceDefinitionService.addDevice(DeviceDefinition)
+
+        if (deviceDefinitionService.addDevice(deviceDefinition)) {
+            ItemUpFromDirectoryDto itemUpFromDirectoryDto = new ItemUpFromDirectoryDto();
+            BeanUtils.copyProperties(deviceManageUpDto, itemUpFromDirectoryDto);
+            itemUpFromDirectoryDto.setTypeCode(deviceManageUpDto.getItemTypeCode())
+                .setInstanceTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION)
+                .setEffectiveStart(DateUtils.getNowDate()).setStatusEnum(PublicationStatus.ACTIVE.getValue())
+                .setConditionFlag(Whether.YES.getValue()).setChargeName(deviceManageUpDto.getName())
+                .setInstanceId(deviceDefinition.getId())
+                .setPrice(deviceManageUpDto.getRetailPrice());
+
+            return itemDefinitionServic.addItem(itemUpFromDirectoryDto)
                 ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"器材目录"}))
                 : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null));
         }
+
+        return R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null));
+    }
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagnosisTreatmentManageAppServiceImpl.java

@@ -0,0 +1,331 @@
+package com.openhis.web.datadictionary.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import com.openhis.administration.domain.Supplier;
+import com.openhis.administration.service.ISupplierService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.core.domain.entity.SysDictData;
+import com.core.common.utils.*;
+import com.core.common.utils.bean.BeanUtils;
+import com.core.system.service.ISysDictTypeService;
+import com.openhis.administration.domain.ChargeItemDefinition;
+import com.openhis.administration.domain.Organization;
+import com.openhis.administration.service.IOrganizationService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.datadictionary.appservice.IDiagnosisTreatmentManageAppService;
+import com.openhis.web.datadictionary.appservice.IItemDefinitionService;
+import com.openhis.web.datadictionary.dto.*;
+import com.openhis.web.datadictionary.mapper.ActivityDefinitionManageMapper;
+import com.openhis.workflow.domain.ActivityDefinition;
+import com.openhis.workflow.mapper.ActivityDefinitionMapper;
+import com.openhis.workflow.service.IActivityDefinitionService;
+
+/**
+ * 诊疗实现类
+ *
+ * @author Wuser
+ * @date 2025/3/28
+ */
+@Service
+public class DiagnosisTreatmentManageAppServiceImpl implements IDiagnosisTreatmentManageAppService {
+
+    @Autowired
+    private IActivityDefinitionService iActivityDefinitionService;
+    @Autowired
+    private ActivityDefinitionMapper activityDefinitionMapper;
+    @Autowired
+    private IOrganizationService iOrganizationService;
+    @Autowired
+    private ISysDictTypeService iSysDictTypeService;
+    @Resource
+    private ActivityDefinitionManageMapper activityDefinitionManageMapper;
+    @Autowired
+    private IItemDefinitionService itemDefinitionServic;
+    @Autowired
+    private ISysDictTypeService sysDictTypeService;
+
+    @Autowired(required = false)
+    AssignSeqUtil assignSeqUtil;
+
+    /**
+     * 诊疗目录初期查询
+     *
+     * @return
+     */
+    @Override
+    public R<?> getDiseaseTreatmentInit() {
+        DiagnosisTreatmentInitDto diagnosisTreatmentInitDto = new DiagnosisTreatmentInitDto();
+        // 获取状态
+        List<DiagnosisTreatmentInitDto.statusEnumOption> statusEnumOptions = Stream.of(PublicationStatus.values())
+            .map(status -> new DiagnosisTreatmentInitDto.statusEnumOption(status.getValue(), status.getInfo()))
+            .collect(Collectors.toList());
+        diagnosisTreatmentInitDto.setStatusFlagOptions(statusEnumOptions);
+        // 获取执行科室
+        LambdaQueryWrapper<Organization> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Organization::getTypeEnum, OrganizationType.HOSPITAL_DEPARTMENT);
+        List<Organization> organizations = iOrganizationService.list(queryWrapper);
+        List<DiagnosisTreatmentInitDto.exeOrganization> exeOrganizations = organizations.stream()
+            .map(exeOrg -> new DiagnosisTreatmentInitDto.exeOrganization(exeOrg.getId(), exeOrg.getName()))
+            .collect(Collectors.toList());
+        diagnosisTreatmentInitDto.setExeOrganizations(exeOrganizations);
+
+        // 获取诊目录疗分类
+        List<SysDictData> diagnosisList =
+            sysDictTypeService.selectDictDataByType(CommonConstants.DictName.DIAGNOSIS_CATEGORY_CODE);
+        // 获取诊疗录疗分类
+        List<DiagnosisTreatmentInitDto.dictCategoryCode> diagnosisCategories = diagnosisList.stream().map(
+                category -> new DiagnosisTreatmentInitDto.dictCategoryCode(category.getDictValue(), category.getDictLabel()))
+            .collect(Collectors.toList());
+        diagnosisTreatmentInitDto.setDiagnosisCategoryOptions(diagnosisCategories);
+
+        // 查询医疗服务项类型
+        List<SysDictData> medical_service_items =
+            iSysDictTypeService.selectDictDataByType(ActivityDefCategory.MEDICAL_SERVICE_ITEM.getCode());
+        // 获取医疗服务项List
+        List<DiagnosisTreatmentInitDto.diseaseTreatmentType> diseaseTreatmentCategoryList = medical_service_items
+            .stream().map(status -> new DiagnosisTreatmentInitDto.diseaseTreatmentType(status.getDictValue(),
+                status.getDictLabel()))
+            .collect(Collectors.toList());
+        List<DiagnosisTreatmentInitDto.diseaseTreatmentCategory> diseaseTreatmentCategories = new ArrayList<>();
+//
+//        //获取目录分类
+//        DiagnosisTreatmentInitDto.diseaseTreatmentCategory diseaseTreatmentCategory =
+//            new DiagnosisTreatmentInitDto.diseaseTreatmentCategory(ActivityDefCategory.MEDICAL_SERVICE_ITEM.getValue(),
+//                ActivityDefCategory.MEDICAL_SERVICE_ITEM.getInfo());
+//        diseaseTreatmentCategory.setChildren(diseaseTreatmentCategoryList);
+//        diseaseTreatmentCategories.add(diseaseTreatmentCategory);
+//        diagnosisTreatmentInitDto.setDiseaseTreatmentCategoryList(diseaseTreatmentCategories);
+//
+//        // 查询手术与治疗类型
+//        List<SysDictData> medical_service_items2 =
+//            iSysDictTypeService.selectDictDataByType(ActivityDefCategory.TREATMENT_SURGERY.getCode());
+//        // 获取手术与治疗List
+//        List<DiagnosisTreatmentInitDto.diseaseTreatmentType> diseaseTreatmentCategoryList2 = medical_service_items2
+//            .stream().map(status -> new DiagnosisTreatmentInitDto.diseaseTreatmentType(status.getDictValue(),
+//                status.getDictLabel()))
+//            .collect(Collectors.toList());
+//
+//        DiagnosisTreatmentInitDto.diseaseTreatmentCategory diseaseTreatmentCategory2 =
+//            new DiagnosisTreatmentInitDto.diseaseTreatmentCategory(ActivityDefCategory.TREATMENT_SURGERY.getValue(),
+//                ActivityDefCategory.TREATMENT_SURGERY.getInfo());
+//        diseaseTreatmentCategory2.setChildren(diseaseTreatmentCategoryList2);
+//        diseaseTreatmentCategories.add(diseaseTreatmentCategory2);
+//
+//        diagnosisTreatmentInitDto.setDiseaseTreatmentCategoryList(diseaseTreatmentCategories);
+
+        // 获取类型
+        List<DiagnosisTreatmentInitDto.statusEnumOption> typeEnumOptions = Stream.of(ActivityType.values())
+            .map(status -> new DiagnosisTreatmentInitDto.statusEnumOption(status.getValue(), status.getInfo()))
+            .collect(Collectors.toList());
+        diagnosisTreatmentInitDto.setTypeEnumOptions(typeEnumOptions);
+
+        // 获取是/否 列表
+        // 获取状态
+        List<DiagnosisTreatmentInitDto.statusEnumOption> statusWeatherOption = Stream.of(Whether.values())
+            .map(status -> new DiagnosisTreatmentInitDto.statusEnumOption(status.getValue(), status.getInfo()))
+            .collect(Collectors.toList());
+        diagnosisTreatmentInitDto.setStatusWeatherOption(statusWeatherOption);
+
+        return R.ok(diagnosisTreatmentInitDto);
+    }
+
+    /**
+     * 查询诊疗目录分页列表
+     *
+     * @param DiagnosisTreatmentSelParam 查询条件
+     * @param searchKey 查询条件-模糊查询
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return
+     */
+    @Override
+    public R<?> getDiseaseTreatmentPage(DiagnosisTreatmentSelParam DiagnosisTreatmentSelParam, String searchKey,
+        Integer pageNo, Integer pageSize, HttpServletRequest request) {
+
+        // 构建查询条件
+        QueryWrapper<DiagnosisTreatmentDto> queryWrapper = HisQueryUtils.buildQueryWrapper(DiagnosisTreatmentSelParam,
+            searchKey, new HashSet<>(Arrays.asList("bus_no", "name", "py_str", "wb_str")), request);
+
+        // 分页查询
+        IPage<DiagnosisTreatmentDto> diseaseTreatmentPage =
+            activityDefinitionManageMapper.getDiseaseTreatmentPage(new Page<>(pageNo, pageSize), queryWrapper);
+
+        diseaseTreatmentPage.getRecords().forEach(e -> {
+            // 医保标记枚举类回显赋值
+            e.setYbFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getYbFlag()));
+            // 医保对码标记枚举类回显赋值
+            e.setYbMatchFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getYbMatchFlag()));
+            // 类型举类回显赋值
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(ActivityType.class, e.getTypeEnum()));
+            // 状态举类回显赋值
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(PublicationStatus.class, e.getStatusEnum()));
+        });
+
+        // 返回【诊疗目录列表DTO】分页
+        return R.ok(diseaseTreatmentPage);
+    }
+
+    /**
+     * 根据id查询诊疗详情
+     *
+     * @param id 诊疗ID
+     * @return
+     */
+    @Override
+    public R<?> getDiseaseTreatmentOne(Long id) {
+
+        // 获取租户ID
+        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+        // 根据ID查询【诊疗目录】
+        return R.ok(activityDefinitionManageMapper.getDiseaseTreatmentOne(id, tenantId));
+
+    }
+
+    /**
+     * 诊疗目录编辑
+     *
+     * @param diagnosisTreatmentUpDto 诊疗目录列表
+     * @return
+     */
+    @Override
+    public R<?> editDiseaseTreatment(DiagnosisTreatmentUpDto diagnosisTreatmentUpDto) {
+
+        ActivityDefinition activityDefinition = new ActivityDefinition();
+        BeanUtils.copyProperties(diagnosisTreatmentUpDto, activityDefinition);
+
+        // 使用10位数基础采番
+        String code = assignSeqUtil.getSeq(AssignSeqEnum.DEVICE_NUM.getPrefix(), 10);
+        activityDefinition.setBusNo(code);
+        // 拼音码
+        activityDefinition.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(activityDefinition.getName()));
+        // 五笔码
+        activityDefinition.setWbStr(ChineseConvertUtils.toWBFirstLetter(activityDefinition.getName()));
+
+        // 更新诊疗信息
+        if (iActivityDefinitionService.updateById(activityDefinition)) {
+            ChargeItemDefinition chargeItemDefinition = new ChargeItemDefinition();
+            chargeItemDefinition.setYbType(diagnosisTreatmentUpDto.getYbType())
+                .setTypeCode(diagnosisTreatmentUpDto.getItemTypeCode())
+                .setInstanceTable(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION)
+                .setInstanceId(diagnosisTreatmentUpDto.getId());
+
+            // 更新价格表
+            return itemDefinitionServic.updateItem(chargeItemDefinition)
+                ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊疗目录"}))
+                : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+
+        }
+        return R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    }
+
+    /**
+     * 诊疗目录停用
+     *
+     * @param ids 诊疗目录ID列表
+     * @return
+     */
+    @Override
+    public R<?> editDiseaseTreatmentStop(List<Long> ids) {
+
+        List<ActivityDefinition> ActivityDefinitionList = new CopyOnWriteArrayList<>();
+
+        // 取得更新值
+        for (Long detail : ids) {
+            ActivityDefinition ActivityDefinition = new ActivityDefinition();
+            ActivityDefinition.setId(detail);
+            ActivityDefinition.setStatusEnum(PublicationStatus.RETIRED.getValue());
+            ActivityDefinitionList.add(ActivityDefinition);
+        }
+        // 更新诊疗信息
+        return iActivityDefinitionService.updateBatchById(ActivityDefinitionList)
+            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊疗目录"}))
+            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+
+    }
+
+    /**
+     * 诊疗目录启用
+     *
+     * @param ids 诊疗目录ID列表
+     * @return
+     */
+    @Override
+    public R<?> editDiseaseTreatmentStart(List<Long> ids) {
+
+        List<ActivityDefinition> ActivityDefinitionList = new CopyOnWriteArrayList<>();
+
+        // 取得更新值
+        for (Long detail : ids) {
+            ActivityDefinition ActivityDefinition = new ActivityDefinition();
+            ActivityDefinition.setId(detail);
+            ActivityDefinition.setStatusEnum(PublicationStatus.ACTIVE.getValue());
+            ActivityDefinitionList.add(ActivityDefinition);
+        }
+        // 更新诊疗信息
+        return iActivityDefinitionService.updateBatchById(ActivityDefinitionList)
+            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊疗目录"}))
+            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+
+    }
+
+    /**
+     * 新增外来诊疗目录
+     *
+     * @param diagnosisTreatmentUpDto 诊疗目录
+     * @return
+     */
+    @Override
+    public R<?> addDiseaseTreatment(DiagnosisTreatmentUpDto diagnosisTreatmentUpDto) {
+
+        ActivityDefinition activityDefinition = new ActivityDefinition();
+        BeanUtils.copyProperties(diagnosisTreatmentUpDto, activityDefinition);
+        // 使用10位数基础采番
+        String code = assignSeqUtil.getSeq(AssignSeqEnum.ACTIVITY_DEFINITION_NUM.getPrefix(), 10);
+        activityDefinition.setBusNo(code);
+        // 拼音码
+        activityDefinition.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(activityDefinition.getName()));
+        // 五笔码
+        activityDefinition.setWbStr(ChineseConvertUtils.toWBFirstLetter(activityDefinition.getName()));
+
+        // 新增外来诊疗目录
+        activityDefinition.setStatusEnum(PublicationStatus.DRAFT.getValue());
+        if (iActivityDefinitionService.addDiagnosisTreatment(activityDefinition)) {
+
+            ItemUpFromDirectoryDto itemUpFromDirectoryDto = new ItemUpFromDirectoryDto();
+            BeanUtils.copyProperties(diagnosisTreatmentUpDto, itemUpFromDirectoryDto);
+            itemUpFromDirectoryDto.setTypeCode(diagnosisTreatmentUpDto.getItemTypeCode())
+                .setInstanceTable(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION)
+                .setEffectiveStart(DateUtils.getNowDate()).setStatusEnum(PublicationStatus.ACTIVE.getValue())
+                .setConditionFlag(Whether.YES.getValue()).setChargeName(diagnosisTreatmentUpDto.getName())
+                .setInstanceId(activityDefinition.getId()).setPrice(diagnosisTreatmentUpDto.getRetailPrice());
+
+            return itemDefinitionServic.addItem(itemUpFromDirectoryDto)
+                ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊疗目录"}))
+                : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null));
+
+        }
+        return R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null));
+
+    }
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiseaseManageAppServiceImpl.java

@@ -0,0 +1,213 @@
+package com.openhis.web.datadictionary.appservice.impl;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.ChineseConvertUtils;
+import com.openhis.common.enums.AssignSeqEnum;
+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.MessageUtils;
+import com.core.common.utils.bean.BeanUtils;
+import com.openhis.clinical.domain.ConditionDefinition;
+import com.openhis.clinical.mapper.ConditionDefinitionMapper;
+import com.openhis.clinical.service.IConditionDefinitionService;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.ConditionDefinitionSource;
+import com.openhis.common.enums.PublicationStatus;
+import com.openhis.common.enums.Whether;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisPageUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.datadictionary.appservice.IDiseaseManageAppService;
+import com.openhis.web.datadictionary.dto.DiseaseManageDto;
+import com.openhis.web.datadictionary.dto.DiseaseManageInitDto;
+import com.openhis.web.datadictionary.dto.DiseaseManageSelParam;
+import com.openhis.web.datadictionary.dto.DiseaseManageUpDto;
+
+/**
+ * 病种目录 实现
+ *
+ * @author liuhr
+ * @date 2025/3/30
+ */
+@Service
+public class DiseaseManageAppServiceImpl implements IDiseaseManageAppService {
+
+    @Autowired
+    private ConditionDefinitionMapper conditionDefinitionMapper;
+    @Autowired
+    private IConditionDefinitionService ConditionDefinitionService;
+    @Autowired(required = false)
+    AssignSeqUtil assignSeqUtil;
+
+    /**
+     * 病种目录初始化
+     *
+     * @return
+     */
+    @Override
+    public R<?> getDiseaseInit() {
+
+        DiseaseManageInitDto diseaseManageInitDto = new DiseaseManageInitDto();
+        // 获取疾病目录种类
+        List<DiseaseManageInitDto.diseaseCategory> diseaseCategoryList = Stream.of(ConditionDefinitionSource.values())
+            .map(status -> new DiseaseManageInitDto.diseaseCategory(status.getValue(), status.getInfo()))
+            .collect(Collectors.toList());
+        diseaseManageInitDto.setDiseaseCategoryList(diseaseCategoryList);
+        // 获取状态
+        List<DiseaseManageInitDto.statusEnumOption> statusEnumOptions = Stream.of(PublicationStatus.values())
+            .map(status -> new DiseaseManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
+            .collect(Collectors.toList());
+        diseaseManageInitDto.setStatusFlagOptions(statusEnumOptions);
+
+        return R.ok(diseaseManageInitDto);
+    }
+
+    /**
+     * 查询病种目录分页列表
+     *
+     * @param diseaseManageSelParam 查询条件
+     * @param searchKey 查询条件-模糊查询
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return
+     */
+    public R<?> getDiseaseList(DiseaseManageSelParam diseaseManageSelParam, String searchKey, Integer pageNo,
+        Integer pageSize, HttpServletRequest request) {
+
+        // 构建查询条件
+        QueryWrapper<ConditionDefinition> queryWrapper = HisQueryUtils.buildQueryWrapper(diseaseManageSelParam,
+            searchKey, new HashSet<>(Arrays.asList("condition_code", "name", "py_str", "wb_str")), request);
+        // 设置排序
+        queryWrapper.orderByAsc("condition_code");
+        // 分页查询
+        Page<DiseaseManageDto> diseasePage =
+            HisPageUtils.selectPage(conditionDefinitionMapper, queryWrapper, pageNo, pageSize, DiseaseManageDto.class);
+
+        diseasePage.getRecords().forEach(e -> {
+            // 医保对码枚举类回显赋值
+            e.setYbMatchFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getYbMatchFlag()));
+            // 状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(PublicationStatus.class, e.getStatusEnum()));
+        });
+
+        // 返回【病种目录列表DTO】分页
+        return R.ok(diseasePage);
+    }
+
+    /**
+     * 根据id查询疾病详情
+     *
+     * @param id 疾病ID
+     * @return
+     */
+    public R<?> getDiseaseOne(Long id) {
+        DiseaseManageDto diseaseManageDto = new DiseaseManageDto();
+        // 根据ID查询【病种目录】
+        ConditionDefinition conditionDefinition = ConditionDefinitionService.getById(id);
+        BeanUtils.copyProperties(conditionDefinition, diseaseManageDto);
+        return R.ok(diseaseManageDto);
+    }
+
+    /**
+     * 病种目录编辑
+     *
+     * @param diseaseManageDto 病种目录列表
+     * @return
+     */
+    public R<?> editDisease(DiseaseManageUpDto diseaseManageDto) {
+
+        ConditionDefinition conditionDefinition = new ConditionDefinition();
+        BeanUtils.copyProperties(diseaseManageDto, conditionDefinition);
+        // 拼音码
+        conditionDefinition.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(conditionDefinition.getName()));
+        // 五笔码
+        conditionDefinition.setWbStr(ChineseConvertUtils.toWBFirstLetter(conditionDefinition.getName()));
+
+        // 更新病种信息
+        return ConditionDefinitionService.updateById(conditionDefinition)
+            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"疾病目录"}))
+            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    }
+
+    /**
+     * 病种目录停用
+     *
+     * @param ids 病种目录ID列表
+     * @return
+     */
+    public R<?> editDiseaseStop(List<Long> ids) {
+        List<ConditionDefinition> conditionDefinitionList = new CopyOnWriteArrayList<>();
+
+        // 取得更新值
+        for (Long detail : ids) {
+            ConditionDefinition conditionDefinition = new ConditionDefinition();
+            conditionDefinition.setId(detail);
+            conditionDefinition.setStatusEnum(PublicationStatus.RETIRED.getValue());
+            conditionDefinitionList.add(conditionDefinition);
+        }
+        // 更新病种信息
+        return ConditionDefinitionService.updateBatchById(conditionDefinitionList)
+            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"疾病目录"}))
+            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    }
+
+    /**
+     * 病种目录启用
+     *
+     * @param ids 病种目录ID列表
+     * @return
+     */
+    public R<?> editDiseaseStart(List<Long> ids) {
+        List<ConditionDefinition> conditionDefinitionList = new CopyOnWriteArrayList<>();
+
+        // 取得更新值
+        for (Long detail : ids) {
+            ConditionDefinition conditionDefinition = new ConditionDefinition();
+            conditionDefinition.setId(detail);
+            conditionDefinition.setStatusEnum(PublicationStatus.ACTIVE.getValue());
+            conditionDefinitionList.add(conditionDefinition);
+        }
+        // 更新病种信息
+        return ConditionDefinitionService.updateBatchById(conditionDefinitionList)
+            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"疾病目录"}))
+            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    }
+
+    /**
+     * 新增外来病种目录
+     *
+     * @param diseaseManageUpDto 病种目录
+     * @return
+     */
+    public R<?> addDisease(DiseaseManageUpDto diseaseManageUpDto) {
+        ConditionDefinition conditionDefinition = new ConditionDefinition();
+        BeanUtils.copyProperties(diseaseManageUpDto, conditionDefinition);
+        // 使用10位数基础采番
+        String code = assignSeqUtil.getSeq(AssignSeqEnum.CONDITION_DEFINITION_NUM.getPrefix(), 10);
+        conditionDefinition.setConditionCode(code);
+
+        // 新增外来病种目录
+        conditionDefinition.setStatusEnum(PublicationStatus.DRAFT.getValue());
+        // 拼音码
+        conditionDefinition.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(conditionDefinition.getName()));
+        // 五笔码
+        conditionDefinition.setWbStr(ChineseConvertUtils.toWBFirstLetter(conditionDefinition.getName()));
+        return ConditionDefinitionService.addDisease(conditionDefinition)
+            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"疾病目录"}))
+            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null));
+    }
+
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java

@@ -0,0 +1,116 @@
+package com.openhis.web.datadictionary.appservice.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.core.common.utils.SecurityUtils;
+import com.core.common.utils.bean.BeanUtils;
+import com.openhis.administration.domain.DeviceDefinition;
+import com.openhis.common.enums.ConditionCode;
+import com.openhis.web.datadictionary.dto.DeviceManageUpDto;
+import com.openhis.web.datadictionary.dto.ItemUpFromDirectoryDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.StringUtils;
+import com.openhis.administration.domain.ChargeItemDefDetail;
+import com.openhis.administration.domain.ChargeItemDefinition;
+import com.openhis.administration.service.IChargeItemDefDetailService;
+import com.openhis.administration.service.IChargeItemDefinitionService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.enums.PublicationStatus;
+import com.openhis.common.enums.Whether;
+import com.openhis.medication.domain.MedicationDetail;
+import com.openhis.web.datadictionary.appservice.IItemDefinitionService;
+import com.openhis.web.datadictionary.dto.MedicationManageUpDto;
+
+/**
+ * 项目定价 实现
+ *
+ * @author liuhr
+ * @date 2025/3/25
+ */
+@Service
+public class ItemDefinitionServiceImpl implements IItemDefinitionService {
+
+    @Autowired
+    IChargeItemDefinitionService chargeItemDefinitionService;
+
+    @Autowired
+    IChargeItemDefDetailService chargeItemDefDetailService;
+
+
+    /**
+     * 添加药品/器材/诊疗的项目定价
+     *
+     * @param itemUpFromDirectoryDto 药品/器材/诊疗目录信息
+     */
+    @Override
+    public boolean addItem(ItemUpFromDirectoryDto itemUpFromDirectoryDto) {
+
+
+        ChargeItemDefinition chargeItemDefinition = new ChargeItemDefinition();
+        BeanUtils.copyProperties(itemUpFromDirectoryDto, chargeItemDefinition);
+
+        boolean insertCIDSuccess = chargeItemDefinitionService.save(chargeItemDefinition);
+
+        if (insertCIDSuccess) {
+            List<ChargeItemDefDetail> shargeItemDefDetails = new ArrayList<>();
+            //插入购入价
+            ChargeItemDefDetail chargeItemDefDetail1 = new ChargeItemDefDetail();
+            chargeItemDefDetail1.setDefinitionId(chargeItemDefinition.getId())
+                // 条件:采购
+                .setConditionCode(ConditionCode.PROCUREMENT.getCode())
+                // 购入价
+                .setAmount(itemUpFromDirectoryDto.getPurchasePrice());
+            shargeItemDefDetails.add(chargeItemDefDetail1);
+            //插入零售价
+            ChargeItemDefDetail chargeItemDefDetail2 = new ChargeItemDefDetail();
+            chargeItemDefDetail2.setDefinitionId(chargeItemDefinition.getId())
+                // 条件:单位
+                .setConditionCode(ConditionCode.UNIT.getCode())
+                //单位枚举
+                .setConditionValue(itemUpFromDirectoryDto.getUnitCode())
+                // 零售价
+                .setAmount(itemUpFromDirectoryDto.getRetailPrice());
+
+            shargeItemDefDetails.add(chargeItemDefDetail2);
+
+            //插入最高零售价
+            ChargeItemDefDetail chargeItemDefDetail3 = new ChargeItemDefDetail();
+            chargeItemDefDetail3.setDefinitionId(chargeItemDefinition.getId())
+                // 条件:限制
+                .setConditionCode(ConditionCode.LIMIT.getCode())
+                // 最高零售价
+                .setAmount(itemUpFromDirectoryDto.getMaximumRetailPrice());
+
+            shargeItemDefDetails.add(chargeItemDefDetail3);
+
+            return chargeItemDefDetailService.saveBatch(shargeItemDefDetails);
+        }
+
+        return false;
+    }
+
+
+    /**
+     * 修改项目定价表
+     *
+     * @param chargeItemDefinition 项目定价表信息
+     */
+    @Override
+    public boolean updateItem(ChargeItemDefinition chargeItemDefinition) {
+
+        // 关联项目和代码位为key，更新表
+        LambdaUpdateWrapper<ChargeItemDefinition> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(ChargeItemDefinition::getInstanceId, chargeItemDefinition.getInstanceId());
+        updateWrapper.eq(ChargeItemDefinition::getInstanceTable, chargeItemDefinition.getInstanceTable())
+            .set(ChargeItemDefinition::getYbType, chargeItemDefinition.getYbType())
+            .set(ChargeItemDefinition::getTypeCode, chargeItemDefinition.getTypeCode());
+
+        return chargeItemDefinitionService.update(null, updateWrapper);
+    }
+
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java

@@ -4,6 +4,8 @@
 package com.openhis.web.datadictionary.appservice.impl;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -11,33 +13,37 @@ import java.util.stream.Stream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.core.common.utils.*;
+import com.openhis.web.datadictionary.dto.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.MessageUtils;
+import com.core.common.core.domain.entity.SysDictData;
-import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.bean.BeanUtils;
 import com.core.common.utils.poi.ExcelUtil;
+import com.core.system.service.ISysDictTypeService;
+import com.openhis.administration.domain.ChargeItemDefinition;
+import com.openhis.administration.domain.Supplier;
+import com.openhis.administration.service.ISupplierService;
+import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.AccountStatus;
+import com.openhis.common.enums.*;
-import com.openhis.common.enums.ApplicableScope;
-import com.openhis.common.enums.PublicationStatus;
 import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.medication.domain.Medication;
 import com.openhis.medication.domain.MedicationDefinition;
 import com.openhis.medication.domain.MedicationDetail;
 import com.openhis.medication.service.IMedicationDefinitionService;
 import com.openhis.medication.service.IMedicationService;
+import com.openhis.web.datadictionary.appservice.IItemDefinitionService;
 import com.openhis.web.datadictionary.appservice.IMedicationManageAppService;
-import com.openhis.web.datadictionary.dto.MedicationManageDto;
-import com.openhis.web.datadictionary.dto.MedicationManageInitDto;
-import com.openhis.web.datadictionary.dto.MedicationManageUpDto;
 import com.openhis.web.datadictionary.mapper.MedicationManageSearchMapper;
 
 /**
@@ -57,6 +63,17 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
 
     @Autowired
     private MedicationManageSearchMapper medicationManageSearchMapper;
+    @Autowired
+    private ISupplierService supplierService;
+
+    @Autowired
+    private ISysDictTypeService sysDictTypeService;
+
+    @Autowired
+    private IItemDefinitionService itemDefinitionServic;
+
+    @Autowired(required = false)
+    AssignSeqUtil assignSeqUtil;
 
     /**
      * 药品目录初始化
@@ -75,9 +92,52 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
         List<MedicationManageInitDto.domainEnumOption> domainEnumOptions = Stream.of(ApplicableScope.values())
             .map(domain -> new MedicationManageInitDto.domainEnumOption(domain.getValue(), domain.getInfo()))
             .collect(Collectors.toList());
+        // 查询供应商列表
+        List<Supplier> supplierList = supplierService.getList();
+        // 供应商信息
+        List<MedicationManageInitDto.supplierListOption> supplierListOptions = supplierList.stream()
+            .map(supplier -> new MedicationManageInitDto.supplierListOption(supplier.getId(), supplier.getName()))
+            .collect(Collectors.toList());
+
+        // 获取药品分类
+        List<SysDictData> medicalList =
+            sysDictTypeService.selectDictDataByType(CommonConstants.DictName.MED_CATEGORY_CODE);
+        // 获取药品分类
+        List<MedicationManageInitDto.dictCategoryCode> medicationCategories = medicalList.stream().map(
+            category -> new MedicationManageInitDto.dictCategoryCode(category.getDictValue(), category.getDictLabel()))
+            .collect(Collectors.toList());
+
+        // 获取是/否 列表
+        // 获取状态
+        List<MedicationManageInitDto.statusEnumOption> statusWeatherOption = Stream.of(Whether.values())
+            .map(status -> new MedicationManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
+            .collect(Collectors.toList());
+
+        // 权限限制
+        List<MedicationManageInitDto.statusEnumOption> statusRestrictedOptions = Stream.of(PermissionLimit.values())
+            .map(status -> new MedicationManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
+            .collect(Collectors.toList());
+
+        // 拆分属性
+        List<MedicationManageInitDto.statusEnumOption> partAttributeEnumOptions = Stream.of(SplitPropertyCode.values())
+            .map(status -> new MedicationManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
+            .collect(Collectors.toList());
+
+        // 住院临时医嘱拆分属性的枚举
+        List<MedicationManageInitDto.statusEnumOption> tempOrderSplitPropertyOptions =
+            Stream.of(TempOrderSplitPropertyCode.values())
+                .map(status -> new MedicationManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
+                .collect(Collectors.toList());
 
         medicationManageInitDto.setStatusFlagOptions(statusEnumOptions);
         medicationManageInitDto.setDomainFlagOptions(domainEnumOptions);
+        medicationManageInitDto.setSupplierListOptions(supplierListOptions);
+        medicationManageInitDto.setMedicationCategoryCodeOptions(medicationCategories);
+        medicationManageInitDto.setStatusWeatherOptions(statusWeatherOption);
+        medicationManageInitDto.setStatusRestrictedOptions(statusRestrictedOptions);
+        medicationManageInitDto.setPartAttributeEnumOptions(partAttributeEnumOptions);
+        medicationManageInitDto.setTempOrderSplitPropertyEnumOptions(tempOrderSplitPropertyOptions);
+
         return R.ok(medicationManageInitDto);
     }
 
@@ -91,35 +151,56 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
      * @return 药品目录查询结果
      */
     @Override
-    public R<?> getMedicationList(@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+    public R<?> getMedicationList(MedicationSearchParam medicationSearchParam,
-        @RequestParam(value = "ybMatchFlag", defaultValue = "-1") Integer ybMatchFlag,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
-        @RequestParam(value = "statusEnum", defaultValue = "-1") Integer statusEnum,
-        @RequestParam(value = "categoryCode", defaultValue = "") String categoryCode,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
 
-        // 分页设置
+        // 构建查询条件
-        Integer offset = (pageNo - 1) * pageSize;
+        QueryWrapper<MedicationManageDto> queryWrapper = HisQueryUtils.buildQueryWrapper(medicationSearchParam,
-        // 获取租户ID
+            searchKey, new HashSet<>(Arrays.asList("name", "name_en", "merchandise_name", "bus_no", "py_str", "wb_str",
-        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+                "merchandise_py_str", "merchandise_wb_str")),
-        // 查询药品目录列表
+            null);
-        List<MedicationManageDto> medicationDetailList = medicationManageSearchMapper.getPage(searchKey, ybMatchFlag,
+
-            statusEnum, categoryCode, tenantId, pageSize, offset);
+        IPage<MedicationManageDto> medicationManageDtoPage =
-        // 查询总记录数
+            medicationManageSearchMapper.getPage(new Page<>(pageNo, pageSize), queryWrapper);
-        long total =
-            medicationManageSearchMapper.getPageCount(searchKey, ybMatchFlag, statusEnum, categoryCode, tenantId);
-        // 创建Page对象并设置属性
-        Page<MedicationManageDto> medicationManageDtoPage = new Page<>(pageNo, pageSize, total);
-        medicationManageDtoPage.setRecords(medicationDetailList);
 
         // 枚举类回显赋值
         medicationManageDtoPage.getRecords().forEach(e -> {
             // 药品状态
             e.setStatusEnum_enumText(EnumUtils.getInfoByValue(PublicationStatus.class, e.getStatusEnum()));
-            // 活动标记
+            // 权限限制
-            e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag()));
+            e.setRestrictedEnum_enumText(EnumUtils.getInfoByValue(PermissionLimit.class, e.getRestrictedEnum()));
+            // 是否为活性
+            e.setActiveFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getActiveFlag()));
+            // 医保是否对码
+            e.setYbMatchFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getYbMatchFlag()));
+            // 是否皮试
+            e.setSkinTestFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getSkinTestFlag()));;
+            // 是否为注射药物
+            e.setInjectFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getInjectFlag()));
+            // 是否限制使用
+            e.setRestrictedFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getRestrictedFlag()));
+            // 儿童用药标志
+            e.setChildrenFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getChildrenFlag()));
             // 适用范围
             e.setDomainEnum_enumText(EnumUtils.getInfoByValue(ApplicableScope.class, e.getDomainEnum()));
+
+            // 是否自制
+            e.setSelfFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getSelfFlag()));
+            // 是否抗生素
+            e.setAntibioticFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getAntibioticFlag()));
+            // 基药标识
+            e.setBasicFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getBasicFlag()));
+            // 拆分分属性
+            e.setPartAttributeEnum_enumText(
+                EnumUtils.getInfoByValue(SplitPropertyCode.class, e.getPartAttributeEnum()));
+            // 住院临时医嘱拆分属性
+            e.setThoPartAttributeEnum_enumText(
+                EnumUtils.getInfoByValue(TempOrderSplitPropertyCode.class, e.getThoPartAttributeEnum()));
+            // // 活动标记
+            // e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag()));
+
         });
 
         // 返回【药品录列表DTO】分页
@@ -138,11 +219,31 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
         Medication medication = new Medication();
         BeanUtils.copyProperties(medicationManageUpDto, medication); // 子表信息
         BeanUtils.copyProperties(medicationManageUpDto, medicationDefinition);// 主表信息
+        medicationDefinition.setId(medicationManageUpDto.getMedicationDefId());
+        // 拼音码
+        medicationDefinition.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(medicationDefinition.getName()));
+        medicationDefinition
+            .setMerchandisePyStr(ChineseConvertUtils.toPinyinFirstLetter(medicationDefinition.getMerchandiseName()));
+        // 五笔码
+        medicationDefinition.setWbStr(ChineseConvertUtils.toWBFirstLetter(medicationDefinition.getName()));
+        medicationDefinition
+            .setMerchandiseWbStr(ChineseConvertUtils.toWBFirstLetter(medicationDefinition.getMerchandiseName()));
+
+        ChargeItemDefinition chargeItemDefinition = new ChargeItemDefinition();
+        chargeItemDefinition.setYbType(medicationManageUpDto.getYbType())
+            .setTypeCode(medicationManageUpDto.getTypeCode())
+            .setInstanceTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION)
+            .setInstanceId(medicationManageUpDto.getMedicationDefId());
 
         // 更新子表药品信息
         if (medicationService.updateById(medication)) {
+
             // 更新主表药品信息
-            return medicationDefinitionService.updateById(medicationDefinition)
+            boolean updateMedicationDefinition = medicationDefinitionService.updateById(medicationDefinition);
+            // 更新价格表
+            boolean updateChargeItemDefinition = itemDefinitionServic.updateItem(chargeItemDefinition);
+
+            return (updateMedicationDefinition && updateChargeItemDefinition)
                 ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"药品目录"}))
                 : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
         } else {
@@ -157,7 +258,7 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
      * @return 药品目录查询结果
      */
     @Override
-    public R<?> getMedicationOne(@PathVariable("id") Long id) {
+    public R<?> getMedicationOne(@RequestParam Long id) {
 
         // 获取租户ID
         Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
@@ -223,10 +324,38 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
 
         MedicationDetail medicationDetail = new MedicationDetail();
         BeanUtils.copyProperties(medicationManageUpDto, medicationDetail);
+        // 使用10位数基础采番
+        String code = assignSeqUtil.getSeq(AssignSeqEnum.MEDICATION_NUM.getPrefix(),10);
+        medicationDetail.setBusNo(code);
+        // 拼音码
+        medicationDetail.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(medicationDetail.getName()));
+        medicationDetail
+            .setMerchandisePyStr(ChineseConvertUtils.toPinyinFirstLetter(medicationDetail.getMerchandiseName()));
+        // 五笔码
+        medicationDetail.setWbStr(ChineseConvertUtils.toWBFirstLetter(medicationDetail.getName()));
+        medicationDetail
+            .setMerchandiseWbStr(ChineseConvertUtils.toWBFirstLetter(medicationDetail.getMerchandiseName()));
+
         // 新增主表外来药品目录
         if (medicationDefinitionService.addMedication(medicationDetail)) {
+
             // 新增子表外来药品目录
-            return medicationService.addMedication(medicationDetail)
+            boolean insertMedicationSuccess = medicationService.addMedication(medicationDetail);
+            ItemUpFromDirectoryDto itemUpFromDirectoryDto = new ItemUpFromDirectoryDto();
+            BeanUtils.copyProperties(medicationManageUpDto, itemUpFromDirectoryDto);
+            itemUpFromDirectoryDto.setInstanceId(medicationDetail.getMedicationDefId())
+                .setStatusEnum(PublicationStatus.ACTIVE.getValue())
+                .setInstanceTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION)
+                .setEffectiveStart(DateUtils.getNowDate())
+                .setOrgId(SecurityUtils.getLoginUser().getOrgId())
+                .setConditionFlag(Whether.YES.getValue())
+                .setChargeName(medicationDetail.getName())
+                .setPrice(medicationManageUpDto.getRetailPrice());
+
+            // 添加药品成功后，添加相应的条件价格表信息
+            boolean insertItemDefinitionSuccess = itemDefinitionServic.addItem(itemUpFromDirectoryDto);
+
+            return (insertMedicationSuccess && insertItemDefinitionSuccess)
                 ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"药品目录"}))
                 : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null));
         } else {

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java

@@ -12,12 +12,16 @@ import java.util.stream.Stream;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.alibaba.druid.sql.visitor.functions.Isnull;
 import com.core.common.utils.ChineseConvertUtils;
+import com.core.common.utils.StringUtils;
 import com.openhis.administration.domain.Supplier;
 import com.openhis.administration.mapper.SupplierMapper;
 import com.openhis.administration.service.ISupplierService;
 import com.openhis.common.enums.AccountStatus;
 import com.openhis.common.enums.SupplierType;
+import com.openhis.common.enums.SupplyStatus;
+import com.openhis.common.enums.SupplyType;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.web.datadictionary.appservice.ISupplierManagementAppService;
 import com.openhis.web.datadictionary.dto.SupplierDto;
@@ -73,27 +77,33 @@ public class SupplierManagementAppServiceImpl implements ISupplierManagementAppS
      *
      * @param supplierSearchParam 查询条件
      * @param searchKey 查询条件-模糊查询
+     * @param typeEnum 查询条件
      * @param pageNo 查询条件
      * @param pageSize 查询条件
      * @return 厂商/产地查询结果
      */
     @Override
-    public R<?> getSupplierList(SupplierSearchParam supplierSearchParam,
+    public R<?> getSupplierList(SupplierSearchParam supplierSearchParam, String searchKey,
-        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+                                Integer typeEnum, Integer pageNo, Integer pageSize, HttpServletRequest request) {
-        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
-        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
 
         // 构建查询条件
         QueryWrapper<Supplier> queryWrapper = HisQueryUtils.buildQueryWrapper(supplierSearchParam, searchKey,
             new HashSet<>(Arrays.asList("bus_no", "name", "py_str", "wb_str")), request);
+        if(StringUtils.isNotNull(typeEnum)){
+            queryWrapper.eq("type_enum",typeEnum);
+        }
+
         // 设置排序
         queryWrapper.orderByAsc("bus_no");
         // 分页查询
         Page<SupplierDto> supplierPage =
             HisPageUtils.selectPage(supplierMapper, queryWrapper, pageNo, pageSize, SupplierDto.class);
         // 枚举类回显赋值
-        supplierPage.getRecords()
+        supplierPage.getRecords().forEach(e -> {
-            .forEach(e -> e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag())));
+            e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag()));
+            // 厂商类型
+            e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplierType.class, e.getTypeEnum()));
+        });
         // 返回【病种目录列表DTO】分页
         return R.ok(supplierPage);
     }
@@ -104,7 +114,7 @@ public class SupplierManagementAppServiceImpl implements ISupplierManagementAppS
      * @param supplierUpDto 供应商信息
      */
     @Override
-    public R<?> addSupplyRequest(@Validated @RequestBody SupplierUpDto supplierUpDto) {
+    public R<?> addSupplyRequest(SupplierUpDto supplierUpDto) {
 
         Supplier supplierInfo = new Supplier();
         BeanUtils.copyProperties(supplierUpDto, supplierInfo);
@@ -123,7 +133,7 @@ public class SupplierManagementAppServiceImpl implements ISupplierManagementAppS
      * @param supplierUpDto 供应商信息
      */
     @Override
-    public R<?> editSupplyRequest(@Validated @RequestBody SupplierUpDto supplierUpDto) {
+    public R<?> editSupplyRequest(SupplierUpDto supplierUpDto) {
 
         Supplier supplier = new Supplier();
         BeanUtils.copyProperties(supplierUpDto, supplier);

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java

@@ -118,12 +118,9 @@ public class DeviceManageController {
      * @return
      */
     @GetMapping("/information-one")
-    public R<?> getDeviceOne(@PathVariable("id") Long id) {
+    public R<?> getDeviceOne(@RequestParam Long id) {
 
         return deviceManageAppService.getDeviceOne(id);
-        // // 根据ID查询【器材目录】
-        // DeviceDefinition byId = iDeviceDefinitionService.getById(id);
-        // return R.ok(byId);
     }
 
     /**
@@ -137,13 +134,6 @@ public class DeviceManageController {
 
         return deviceManageAppService.editDevice(deviceManageDto);
 
-        // DeviceDefinition DeviceDefinition = new DeviceDefinition();
-        // BeanUtils.copyProperties(deviceManageDto, DeviceDefinition);
-        //
-        // // 更新器材信息
-        // return iDeviceDefinitionService.updateById(DeviceDefinition)
-        // ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"器材目录"}))
-        // : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
     }
 
     /**

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java

@@ -1,43 +1,18 @@
 package com.openhis.web.datadictionary.controller;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-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.core.domain.entity.SysDictData;
+import com.openhis.web.datadictionary.appservice.IDiagnosisTreatmentManageAppService;
-import com.core.common.utils.MessageUtils;
-import com.core.common.utils.bean.BeanUtils;
-import com.core.system.service.ISysDictTypeService;
-import com.openhis.administration.domain.Organization;
-import com.openhis.administration.service.IOrganizationService;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.ActivityDefCategory;
-import com.openhis.common.enums.OrganizationType;
-import com.openhis.common.enums.PublicationStatus;
-import com.openhis.common.enums.Whether;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisPageUtils;
-import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto;
-import com.openhis.web.datadictionary.dto.DiagnosisTreatmentInitDto;
 import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
 import com.openhis.web.datadictionary.dto.DiagnosisTreatmentUpDto;
-import com.openhis.workflow.domain.ActivityDefinition;
-import com.openhis.workflow.mapper.ActivityDefinitionMapper;
-import com.openhis.workflow.service.IActivityDefinitionService;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -49,14 +24,13 @@ import lombok.extern.slf4j.Slf4j;
  * @date 2025-02-20
  */
 @RestController
-@RequestMapping("/datadictionary/diagnosistreatment")
+@RequestMapping("/data-dictionary/diagnosis-treatment")
 @Slf4j
 @AllArgsConstructor
 public class DiagnosisTreatmentController {
-    private final IActivityDefinitionService iActivityDefinitionService;
+
-    private final ActivityDefinitionMapper activityDefinitionMapper;
+    @Autowired
-    private final IOrganizationService iOrganizationService;
+    private IDiagnosisTreatmentManageAppService diagnosisTreatmentManageAppService;
-    private final ISysDictTypeService iSysDictTypeService;
 
     /**
      * 诊疗目录初期查询
@@ -65,55 +39,8 @@ public class DiagnosisTreatmentController {
      */
     @GetMapping("/init")
     public R<?> getDiseaseTreatmentInit() {
-        DiagnosisTreatmentInitDto diagnosisTreatmentInitDto = new DiagnosisTreatmentInitDto();
-        // 获取状态
-        List<DiagnosisTreatmentInitDto.statusEnumOption> statusEnumOptions = Stream.of(PublicationStatus.values())
-            .map(status -> new DiagnosisTreatmentInitDto.statusEnumOption(status.getValue(), status.getInfo()))
-            .collect(Collectors.toList());
-        diagnosisTreatmentInitDto.setStatusFlagOptions(statusEnumOptions);
-        // 获取执行科室
-        LambdaQueryWrapper<Organization> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(Organization::getTypeEnum, OrganizationType.HOSPITAL_DEPARTMENT);
-        List<Organization> organizations = iOrganizationService.list(queryWrapper);
-        List<DiagnosisTreatmentInitDto.exeOrganization> exeOrganizations = organizations.stream()
-            .map(exeOrg -> new DiagnosisTreatmentInitDto.exeOrganization(exeOrg.getId(), exeOrg.getName()))
-            .collect(Collectors.toList());
-        diagnosisTreatmentInitDto.setExeOrganizations(exeOrganizations);
 
-        // 获取诊疗分类
+        return diagnosisTreatmentManageAppService.getDiseaseTreatmentInit();
-        // 查询医疗服务项类型
-        List<SysDictData> medical_service_items =
-            iSysDictTypeService.selectDictDataByType(ActivityDefCategory.MEDICAL_SERVICE_ITEM.getCode());
-        // 获取医疗服务项List
-        List<DiagnosisTreatmentInitDto.diseaseTreatmentType> diseaseTreatmentCategoryList = medical_service_items
-            .stream().map(status -> new DiagnosisTreatmentInitDto.diseaseTreatmentType(status.getDictValue(),
-                status.getDictLabel()))
-            .collect(Collectors.toList());
-        List<DiagnosisTreatmentInitDto.diseaseTreatmentCategory> diseaseTreatmentCategories = new ArrayList<>();
-
-        DiagnosisTreatmentInitDto.diseaseTreatmentCategory diseaseTreatmentCategory =
-            new DiagnosisTreatmentInitDto.diseaseTreatmentCategory(ActivityDefCategory.MEDICAL_SERVICE_ITEM.getValue(),
-                ActivityDefCategory.MEDICAL_SERVICE_ITEM.getInfo());
-        diseaseTreatmentCategory.setChildren(diseaseTreatmentCategoryList);
-        diseaseTreatmentCategories.add(diseaseTreatmentCategory);
-        diagnosisTreatmentInitDto.setDiseaseTreatmentCategoryList(diseaseTreatmentCategories);
-
-        // 查询手术与治疗类型
-        List<SysDictData> medical_service_items2 =
-            iSysDictTypeService.selectDictDataByType(ActivityDefCategory.TREATMENT_SURGERY.getCode());
-        // 获取手术与治疗List
-        List<DiagnosisTreatmentInitDto.diseaseTreatmentType> diseaseTreatmentCategoryList2 = medical_service_items2
-            .stream().map(status -> new DiagnosisTreatmentInitDto.diseaseTreatmentType(status.getDictValue(),
-                status.getDictLabel()))
-            .collect(Collectors.toList());
-        DiagnosisTreatmentInitDto.diseaseTreatmentCategory diseaseTreatmentCategory2 =
-            new DiagnosisTreatmentInitDto.diseaseTreatmentCategory(ActivityDefCategory.TREATMENT_SURGERY.getValue(),
-                ActivityDefCategory.TREATMENT_SURGERY.getInfo());
-        diseaseTreatmentCategory2.setChildren(diseaseTreatmentCategoryList2);
-        diseaseTreatmentCategories.add(diseaseTreatmentCategory2);
-
-        diagnosisTreatmentInitDto.setDiseaseTreatmentCategoryList(diseaseTreatmentCategories);
-        return R.ok(diagnosisTreatmentInitDto);
     }
 
     /**
@@ -131,24 +58,9 @@ public class DiagnosisTreatmentController {
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
 
-        // 构建查询条件
-        QueryWrapper<ActivityDefinition> queryWrapper = HisQueryUtils.buildQueryWrapper(DiagnosisTreatmentSelParam,
-            searchKey, new HashSet<>(Arrays.asList("bus_no", "name", "py_str", "wb_str")), request);
-        // 设置排序
-        queryWrapper.orderByAsc("bus_no");
-        // 分页查询
-        Page<DiagnosisTreatmentDto> diseaseTreatmentPage = HisPageUtils.selectPage(activityDefinitionMapper,
-            queryWrapper, pageNo, pageSize, DiagnosisTreatmentDto.class);
-
-        diseaseTreatmentPage.getRecords().forEach(e -> {
-            // 医保标记枚举类回显赋值
-            e.setYbFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getYbFlag()));
-            // 医保对码标记枚举类回显赋值
-            e.setYbMatchFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getYbMatchFlag()));
-        });
-
         // 返回【诊疗目录列表DTO】分页
-        return R.ok(diseaseTreatmentPage);
+        return diagnosisTreatmentManageAppService.getDiseaseTreatmentPage(DiagnosisTreatmentSelParam, searchKey, pageNo,
+            pageSize, request);
     }
 
     /**
@@ -158,12 +70,9 @@ public class DiagnosisTreatmentController {
      * @return
      */
     @GetMapping("/information-one")
-    public R<?> getDiseaseTreatmentOne(@PathVariable("id") Long id) {
+    public R<?> getDiseaseTreatmentOne(@RequestParam Long id) {
-        DiagnosisTreatmentDto diagnosisTreatmentDto = new DiagnosisTreatmentDto();
+
-        // 根据ID查询【诊疗目录】
+        return diagnosisTreatmentManageAppService.getDiseaseTreatmentOne(id);
-        ActivityDefinition activityDefinition = iActivityDefinitionService.getById(id);
-        BeanUtils.copyProperties(activityDefinition, diagnosisTreatmentDto);
-        return R.ok(diagnosisTreatmentDto);
     }
 
     /**
@@ -175,13 +84,7 @@ public class DiagnosisTreatmentController {
     @PutMapping("/information")
     public R<?> editDiseaseTreatment(@RequestBody DiagnosisTreatmentUpDto diagnosisTreatmentUpDto) {
 
-        ActivityDefinition ActivityDefinition = new ActivityDefinition();
+        return diagnosisTreatmentManageAppService.editDiseaseTreatment(diagnosisTreatmentUpDto);
-        BeanUtils.copyProperties(diagnosisTreatmentUpDto, ActivityDefinition);
-
-        // 更新诊疗信息
-        return iActivityDefinitionService.updateById(ActivityDefinition)
-            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊疗目录"}))
-            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
     }
 
     /**
@@ -192,19 +95,8 @@ public class DiagnosisTreatmentController {
      */
     @PutMapping("/information-stop")
     public R<?> editDiseaseTreatmentStop(@RequestBody List<Long> ids) {
-        List<ActivityDefinition> ActivityDefinitionList = new CopyOnWriteArrayList<>();
 
-        // 取得更新值
+        return diagnosisTreatmentManageAppService.editDiseaseTreatmentStop(ids);
-        for (Long detail : ids) {
-            ActivityDefinition ActivityDefinition = new ActivityDefinition();
-            ActivityDefinition.setId(detail);
-            ActivityDefinition.setStatusEnum(PublicationStatus.RETIRED.getValue());
-            ActivityDefinitionList.add(ActivityDefinition);
-        }
-        // 更新诊疗信息
-        return iActivityDefinitionService.updateBatchById(ActivityDefinitionList)
-            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊疗目录"}))
-            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
     }
 
     /**
@@ -215,19 +107,7 @@ public class DiagnosisTreatmentController {
      */
     @PutMapping("/information-start")
     public R<?> editDiseaseTreatmentStart(@RequestBody List<Long> ids) {
-        List<ActivityDefinition> ActivityDefinitionList = new CopyOnWriteArrayList<>();
+        return diagnosisTreatmentManageAppService.editDiseaseTreatmentStart(ids);
-
-        // 取得更新值
-        for (Long detail : ids) {
-            ActivityDefinition ActivityDefinition = new ActivityDefinition();
-            ActivityDefinition.setId(detail);
-            ActivityDefinition.setStatusEnum(PublicationStatus.ACTIVE.getValue());
-            ActivityDefinitionList.add(ActivityDefinition);
-        }
-        // 更新诊疗信息
-        return iActivityDefinitionService.updateBatchById(ActivityDefinitionList)
-            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊疗目录"}))
-            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
     }
 
     /**
@@ -238,13 +118,7 @@ public class DiagnosisTreatmentController {
      */
     @PostMapping("/information")
     public R<?> addDiseaseTreatment(@Validated @RequestBody DiagnosisTreatmentUpDto diagnosisTreatmentUpDto) {
-        ActivityDefinition ActivityDefinition = new ActivityDefinition();
+        return diagnosisTreatmentManageAppService.addDiseaseTreatment(diagnosisTreatmentUpDto);
-        BeanUtils.copyProperties(diagnosisTreatmentUpDto, ActivityDefinition);
-        // 新增外来诊疗目录
-        ActivityDefinition.setStatusEnum(PublicationStatus.DRAFT.getValue());
-        return iActivityDefinitionService.addDiagnosisTreatment(ActivityDefinition)
-            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊疗目录"}))
-            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null));
     }
 
     /**

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java

@@ -1,32 +1,18 @@
 package com.openhis.web.datadictionary.controller;
 
-import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-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.MessageUtils;
 import com.core.common.utils.bean.BeanUtils;
 import com.openhis.clinical.domain.ConditionDefinition;
-import com.openhis.clinical.mapper.ConditionDefinitionMapper;
+import com.openhis.web.datadictionary.appservice.IDiseaseManageAppService;
-import com.openhis.clinical.service.IConditionDefinitionService;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.ConditionDefinitionSource;
-import com.openhis.common.enums.PublicationStatus;
-import com.openhis.common.utils.HisPageUtils;
-import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.datadictionary.dto.DiseaseManageDto;
-import com.openhis.web.datadictionary.dto.DiseaseManageInitDto;
 import com.openhis.web.datadictionary.dto.DiseaseManageSelParam;
 import com.openhis.web.datadictionary.dto.DiseaseManageUpDto;
 
@@ -44,8 +30,9 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 @AllArgsConstructor
 public class DiseaseManageController {
-    private final IConditionDefinitionService iConditionDefinitionService;
+
-    private final ConditionDefinitionMapper conditionDefinitionMapper;
+    @Autowired
+    private IDiseaseManageAppService diseaseManageAppService;
 
     /**
      * 病种目录初始化
@@ -54,18 +41,8 @@ public class DiseaseManageController {
      */
     @GetMapping("/information-init")
     public R<?> getDiseaseInit() {
-        DiseaseManageInitDto diseaseManageInitDto = new DiseaseManageInitDto();
+
-        // 获取疾病目录种类
+        return diseaseManageAppService.getDiseaseInit();
-        List<DiseaseManageInitDto.diseaseCategory> diseaseCategoryList = Stream.of(ConditionDefinitionSource.values())
-            .map(status -> new DiseaseManageInitDto.diseaseCategory(status.getValue(), status.getInfo()))
-            .collect(Collectors.toList());
-        diseaseManageInitDto.setDiseaseCategoryList(diseaseCategoryList);
-        // 获取状态
-        List<DiseaseManageInitDto.statusEnumOption> statusEnumOptions = Stream.of(PublicationStatus.values())
-            .map(status -> new DiseaseManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
-            .collect(Collectors.toList());
-        diseaseManageInitDto.setStatusFlagOptions(statusEnumOptions);
-        return R.ok(diseaseManageInitDto);
     }
 
     /**
@@ -83,16 +60,8 @@ public class DiseaseManageController {
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
 
-        // 构建查询条件
-        QueryWrapper<ConditionDefinition> queryWrapper = HisQueryUtils.buildQueryWrapper(diseaseManageSelParam,
-            searchKey, new HashSet<>(Arrays.asList("condition_code", "name", "py_str", "wb_str")), request);
-        // 设置排序
-        queryWrapper.orderByAsc("condition_code");
-        // 分页查询
-        Page<DiseaseManageDto> diseasePage =
-            HisPageUtils.selectPage(conditionDefinitionMapper, queryWrapper, pageNo, pageSize, DiseaseManageDto.class);
         // 返回【病种目录列表DTO】分页
-        return R.ok(diseasePage);
+        return diseaseManageAppService.getDiseaseList(diseaseManageSelParam, searchKey, pageNo, pageSize, request);
     }
 
     /**
@@ -102,12 +71,10 @@ public class DiseaseManageController {
      * @return
      */
     @GetMapping("/information-one")
-    public R<?> getDiseaseOne(@PathVariable("id") Long id) {
+    public R<?> getDiseaseOne(@RequestParam Long id) {
-        DiseaseManageDto diseaseManageDto = new DiseaseManageDto();
+
         // 根据ID查询【病种目录】
-        ConditionDefinition conditionDefinition = iConditionDefinitionService.getById(id);
+        return diseaseManageAppService.getDiseaseOne(id);
-        BeanUtils.copyProperties(conditionDefinition, diseaseManageDto);
-        return R.ok(diseaseManageDto);
     }
 
     /**
@@ -123,9 +90,7 @@ public class DiseaseManageController {
         BeanUtils.copyProperties(diseaseManageDto, conditionDefinition);
 
         // 更新病种信息
-        return iConditionDefinitionService.updateById(conditionDefinition)
+        return diseaseManageAppService.editDisease(diseaseManageDto);
-            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"疾病目录"}))
-            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
     }
 
     /**
@@ -136,19 +101,8 @@ public class DiseaseManageController {
      */
     @PutMapping("/information-stop")
     public R<?> editDiseaseStop(@RequestBody List<Long> ids) {
-        List<ConditionDefinition> conditionDefinitionList = new CopyOnWriteArrayList<>();
-
-        // 取得更新值
-        for (Long detail : ids) {
-            ConditionDefinition conditionDefinition = new ConditionDefinition();
-            conditionDefinition.setId(detail);
-            conditionDefinition.setStatusEnum(PublicationStatus.RETIRED.getValue());
-            conditionDefinitionList.add(conditionDefinition);
-        }
         // 更新病种信息
-        return iConditionDefinitionService.updateBatchById(conditionDefinitionList)
+        return diseaseManageAppService.editDiseaseStop(ids);
-            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"疾病目录"}))
-            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
     }
 
     /**
@@ -159,19 +113,9 @@ public class DiseaseManageController {
      */
     @PutMapping("/information-start")
     public R<?> editDiseaseStart(@RequestBody List<Long> ids) {
-        List<ConditionDefinition> conditionDefinitionList = new CopyOnWriteArrayList<>();
 
-        // 取得更新值
-        for (Long detail : ids) {
-            ConditionDefinition conditionDefinition = new ConditionDefinition();
-            conditionDefinition.setId(detail);
-            conditionDefinition.setStatusEnum(PublicationStatus.ACTIVE.getValue());
-            conditionDefinitionList.add(conditionDefinition);
-        }
         // 更新病种信息
-        return iConditionDefinitionService.updateBatchById(conditionDefinitionList)
+        return diseaseManageAppService.editDiseaseStart(ids);
-            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"疾病目录"}))
-            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
     }
 
     /**
@@ -182,13 +126,8 @@ public class DiseaseManageController {
      */
     @PostMapping("/information")
     public R<?> addDisease(@Validated @RequestBody DiseaseManageUpDto diseaseManageUpDto) {
-        ConditionDefinition conditionDefinition = new ConditionDefinition();
+
-        BeanUtils.copyProperties(diseaseManageUpDto, conditionDefinition);
+        return diseaseManageAppService.addDisease(diseaseManageUpDto);
-        // 新增外来病种目录
-        conditionDefinition.setStatusEnum(PublicationStatus.DRAFT.getValue());
-        return iConditionDefinitionService.addDisease(conditionDefinition)
-            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"疾病目录"}))
-            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null));
     }
 
     /**

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java

@@ -5,6 +5,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.openhis.web.datadictionary.dto.MedicationSearchParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -44,22 +45,18 @@ public class MedicationManageController {
     /**
      * 查询药品目录分页列表
      *
-     * @param searchKey 查询条件
+     * @param medicationSearchParam 查询条件
-     * @param statusEnum 查询条件-状态
+     * @param searchKey 模糊查询条件
-     * @param ybMatchFlag 查询条件-是否对码
-     * @param categoryCode 查询条件-药品分类
      * @param pageNo 当前页码
      * @param pageSize 查询条数
      * @return
      */
     @GetMapping("/information-page")
-    public R<?> getMedicationList(@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+    public R<?> getMedicationList(
-        @RequestParam(value = "ybMatchFlag", defaultValue = "-1") Integer ybMatchFlag,
+        MedicationSearchParam medicationSearchParam,@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
-        @RequestParam(value = "statusEnum", defaultValue = "-1") Integer statusEnum,
-        @RequestParam(value = "categoryCode", defaultValue = "") String categoryCode,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
-        return medicationManageAppService.getMedicationList(searchKey, ybMatchFlag, statusEnum, categoryCode, pageNo,
+        return medicationManageAppService.getMedicationList(medicationSearchParam,searchKey,pageNo,
             pageSize, request);
     }
 
@@ -70,7 +67,7 @@ public class MedicationManageController {
      * @return
      */
     @GetMapping("/information-one")
-    public R<?> getMedicationOne(@PathVariable("id") Long id) {
+    public R<?> getMedicationOne(@RequestParam Long id) {
         return medicationManageAppService.getMedicationOne(id);
     }
 

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java

@@ -46,6 +46,7 @@ public class SupplierManagementController {
      *
      * @param supplierSearchParam 查询条件
      * @param searchKey 查询条件-模糊查询
+     * @param typeEnum 查询条件
      * @param pageNo 查询条件
      * @param pageSize 查询条件
      * @return 厂商/产地查询结果
@@ -53,11 +54,12 @@ public class SupplierManagementController {
     @GetMapping(value = "/get-supplier-list")
     public R<?> getSupplierList(SupplierSearchParam supplierSearchParam,
         @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "typeEnum", defaultValue = "") Integer typeEnum,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
 
         // 返回分页
-        return  supplierManagementAppService.getSupplierList(supplierSearchParam, searchKey, pageNo, pageSize, request);
+        return  supplierManagementAppService.getSupplierList(supplierSearchParam, searchKey,typeEnum, pageNo, pageSize, request);
     }
 
     /**

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
 import com.openhis.common.enums.DeviceCategory;
 import com.openhis.common.enums.PublicationStatus;
 
@@ -36,13 +37,19 @@ public class DeviceManageDto {
     private String wbStr;
 
     /** 器材分类 */
-    private DeviceCategory categoryEnum;
+    @Dict(dictCode = "device_category_code")
+    private String categoryCode;
+    private String categoryCode_dictText;
 
     /** 器材种类 */
+    @Dict(dictCode = "device_type_code")
     private String typeCode;
+    private String typeCode_dictText;
 
     /** 包装单位 */
+    @Dict(dictCode = "unit_code")
     private String unitCode;
+    private String unitCode_dictText;
 
     /** 包装规格 */
     private String size;
@@ -51,7 +58,21 @@ public class DeviceManageDto {
     private BigDecimal partPercent;
 
     /** 最小使用单位 */
+    @Dict(dictCode = "unit_code")
     private String minUnitCode;
+    private String minUnitCode_dictText;
+
+    /** 所属科室 */
+    @Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+    private String orgId_dictText;
+
+    /** 所在位置 */
+    @Dict(dictTable = "adm_location", dictCode = "id", dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+    private String locationId_dictText;
 
     /** 产品型号 */
     private String modelNumber;
@@ -61,7 +82,9 @@ public class DeviceManageDto {
     private String hvcmFlag_enumText;
 
     /** 销售单位 */
+    @Dict(dictCode = "unit_code")
     private String salesUnitCode;
+    private String salesUnitCode_dictText;
 
     /** 批准文号 */
     private String approvalNumber;
@@ -78,13 +101,21 @@ public class DeviceManageDto {
     private String ybMatchFlag_enumText;
 
     /** 状态 */
-    private PublicationStatus statusEnum;
+    private Integer statusEnum;
+    private String statusEnum_enumText;
 
     /** 生产厂家 */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long manufacturerId;
 
+    /** 生产厂商文本 */
+    private String manufacturerText;
+
     /** 供应商 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @Dict(dictTable = "adm_supplier",dictCode = "id",dictText = "name")
     private Long supplyId;
+    private String supplyId_dictText;
 
     /** 说明 */
     private String description;
@@ -92,9 +123,6 @@ public class DeviceManageDto {
     /** 适用范围 */
     private String jurisdiction;
 
-    /** 执行科室 */
-    private Long ruleId;
-
     /** 器材版本 */
     private String version;
 
@@ -104,4 +132,24 @@ public class DeviceManageDto {
     /** 过敏标记 */
     private Integer allergenFlag;
     private String allergenFlag_enumText;
+
+    /** 财务类别 */
+    @Dict(dictCode = "fin_type_code")
+    private String itemTypeCode;
+    private String itemTypeCode_dictText;
+
+    /** 医保类别 */
+    @Dict(dictCode = "yb_type")
+    private String ybType;
+    private String ybType_dictText;
+
+    /** 购入价 */
+    private BigDecimal purchasePrice;
+
+    /** 零售价 */
+    private BigDecimal retailPrice;
+
+    /** 最高零售价 */
+    private BigDecimal maximumRetailPrice;
+
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageInitDto.java

@@ -3,6 +3,8 @@ package com.openhis.web.datadictionary.dto;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -16,8 +18,12 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class DeviceManageInitDto {
     private List<statusEnumOption> statusFlagOptions;
-    private List<deviceCategory> deviceCategories;
+    private List<dictCategoryCode> deviceCategories;
     private List<exeOrganization> exeOrganizations;
+    // 供应商
+    private List<supplierListOption> supplierListOptions;
+    // 是/否 状态
+    private List<statusEnumOption> statusYBWeatherOptions;
 
     /**
      * 状态
@@ -48,6 +54,21 @@ public class DeviceManageInitDto {
         }
     }
 
+    /**
+     * 器材分类
+     */
+    @Data
+    public static class dictCategoryCode {
+        private String value;
+        private String info;
+        private List<dictCategoryCode> children = new ArrayList<>();
+
+        public dictCategoryCode(String value, String info) {
+            this.value = value;
+            this.info = info;
+        }
+    }
+
     /**
      * 执行机构
      */
@@ -61,4 +82,21 @@ public class DeviceManageInitDto {
             this.label = label;
         }
     }
+
+    /**
+     * 供应商
+     */
+    @Data
+    public static class supplierListOption {
+
+        @JsonSerialize(using = ToStringSerializer.class)
+        private Long value;
+        private String label;
+
+        public supplierListOption(Long value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageSelParam.java

@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
 public class DeviceManageSelParam {
 
     /** 器材分类 */
-    private Integer categoryEnum;
+    private String categoryCode;
 
     /** 医保对码标记 */
     private Integer ybMatchFlag;
@@ -22,6 +22,4 @@ public class DeviceManageSelParam {
     /** 状态 */
     private Integer statusEnum;
 
-    /** 执行科室 */
-    private Long ruleId;
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java

@@ -7,6 +7,7 @@ import javax.validation.constraints.NotNull;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
 import com.openhis.common.enums.DeviceCategory;
 
 import lombok.Data;
@@ -26,7 +27,6 @@ public class DeviceManageUpDto {
     private Long id;
 
     /** 编码 */
-    @NotBlank(message = "器材编码不能为空")
     private String busNo;
 
     /** 器材名称 */
@@ -34,16 +34,14 @@ public class DeviceManageUpDto {
     private String name;
 
     /** 器材名称拼音 */
-    @NotBlank(message = "器材名称拼音不能为空")
     private String pyStr;
 
     /** 器材五笔拼音 */
-    @NotBlank(message = "器材五笔拼音不能为空")
     private String wbStr;
 
     /** 器材分类 */
     @NotNull(message = "器材分类不能为空")
-    private DeviceCategory categoryEnum;
+    private String categoryCode;
 
     /** 器材种类 */
     @NotBlank(message = "器材种类不能为空")
@@ -65,12 +63,25 @@ public class DeviceManageUpDto {
     @NotBlank(message = "最小使用单位不能为空")
     private String minUnitCode;
 
+    /** 所属科室 */
+    @NotNull(message = "所属科室不能为空")
+    @Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+    private String orgId_dictText;
+
+    /** 所在位置 */
+    @NotNull(message = "所在位置不能为空")
+    @Dict(dictTable = "adm_location", dictCode = "id", dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+    private String locationId_dictText;
+
     /** 产品型号 */
     @NotBlank(message = "产品型号不能为空")
     private String modelNumber;
 
     /** 高值器材标志 */
-    // @NotNull(message = "高值器材标志不能为空")
     private Integer hvcmFlag;
 
     /** 销售单位 */
@@ -82,22 +93,25 @@ public class DeviceManageUpDto {
     private String approvalNumber;
 
     /** 医保标记 */
-    // @NotNull(message = "医保标记不能为空")
     private Integer ybFlag;
 
     /** 医保编码 */
     private String ybNo;
 
     /** 医保对码标记 */
-    // @NotNull(message = "医保对码标记不能为空")
     private Integer ybMatchFlag;
 
     /** 生产厂家 */
-    @NotNull(message = "生产厂家不能为空")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long manufacturerId;
 
+    /** 生产厂商文本 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String manufacturerText;
+
     /** 供应商 */
     @NotNull(message = "供应商不能为空")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long supplyId;
 
     /** 说明 */
@@ -107,10 +121,6 @@ public class DeviceManageUpDto {
     @NotBlank(message = "适用范围不能为空")
     private String jurisdiction;
 
-    /** 执行科室 */
-    @NotNull(message = "执行科室不能为空")
-    private Long ruleId;
-
     /** 器材版本 */
     private String version;
 
@@ -118,6 +128,26 @@ public class DeviceManageUpDto {
     private String substanceText;
 
     /** 过敏标记 */
-    // @NotNull(message = "过敏标记不能为空")
     private Integer allergenFlag;
+
+    /** 购入价 */
+    @NotNull(message = "购入价不能为空")
+    private BigDecimal purchasePrice;
+
+    /** 零售价 */
+    @NotNull(message = "零售价不能为空")
+    private BigDecimal retailPrice;
+
+    /** 最高零售价 */
+    @NotNull(message = "最高零售价不能为空")
+    private BigDecimal maximumRetailPrice;
+
+    /** 财务类别 */
+    @NotNull(message = "财务类别不能为空")
+    private String itemTypeCode;
+
+    /** 医保类别 */
+    @NotNull(message = "医保类别不能为空")
+    private String ybType;
+
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java

@@ -2,12 +2,16 @@ package com.openhis.web.datadictionary.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
 import com.openhis.common.enums.ActivityDefCategory;
 import com.openhis.common.enums.PublicationStatus;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
 /**
  * 诊疗目录分页检索
  *
@@ -22,7 +26,9 @@ public class DiagnosisTreatmentDto {
     private Long id;
 
     /** 目录类别 */
-    private ActivityDefCategory categoryEnum;
+    @Dict(dictCode = "activity_category_code")
+    private String categoryCode;
+    private String categoryCode_dictText;
 
     /** 编码 */
     private String busNo;
@@ -37,10 +43,13 @@ public class DiagnosisTreatmentDto {
     private String wbStr;
 
     /** 类型 */
-    private String typeCode;
+    private Integer typeEnum;
+    private String typeEnum_enumText;
 
     /** 使用单位 */
+    @Dict(dictCode = "rate_code")
     private String permittedUnitCode;
+    private String permittedUnitCode_dictText;
 
     /** 医保标记 */
     private Integer ybFlag;
@@ -54,17 +63,55 @@ public class DiagnosisTreatmentDto {
     private String ybMatchFlag_enumText;
 
     /** 状态 */
-    private PublicationStatus statusEnum;
+    private Integer statusEnum;
+    private String statusEnum_enumText;
 
     /** 身体部位 */
+    @Dict(dictCode = "body_site_code")
     private String bodySiteCode;
+    private String bodySiteCode_dictText;
 
     /** 所需标本 */
+    @Dict(dictCode = "specimen_code")
     private String specimenCode;
+    private String specimenCode_dictText;
 
     /** 说明 */
     private String descriptionText;
 
     /** 规则id */
     private Integer ruleId;
+
+    /** 所属科室 */
+    @Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+    private String orgId_dictText;
+
+    /** 所在位置 */
+    @Dict(dictTable = "adm_location", dictCode = "id", dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+    private String locationId_dictText;
+
+    /** 财务类别 */
+    @Dict(dictCode = "fin_type_code")
+    private String typeCode;
+    private String typeCode_dictText;
+
+    /** 医保类别 */
+    @Dict(dictCode = "med_chrgitm_type")
+    private String ybType;
+    private String ybType_dictText;
+
+    /** 购入价 */
+    private BigDecimal purchasePrice;
+
+    /** 零售价 */
+    private BigDecimal retailPrice;
+
+    /** 最高零售价 */
+    private BigDecimal maximumRetailPrice;
+
+
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentInitDto.java

@@ -3,6 +3,8 @@ package com.openhis.web.datadictionary.dto;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -18,6 +20,11 @@ public class DiagnosisTreatmentInitDto {
     private List<statusEnumOption> statusFlagOptions;
     private List<diseaseTreatmentCategory> diseaseTreatmentCategoryList;
     private List<exeOrganization> exeOrganizations;
+    private List<statusEnumOption> typeEnumOptions;
+    //诊疗目录
+    private List<dictCategoryCode> diagnosisCategoryOptions;
+    //是否list
+    private List<statusEnumOption> statusWeatherOption;
 
     /**
      * 状态
@@ -63,6 +70,21 @@ public class DiagnosisTreatmentInitDto {
         }
     }
 
+    /**
+     * 诊疗目录类型
+     */
+    @Data
+    public static class dictCategoryCode {
+        private String value;
+        private String info;
+        private List<dictCategoryCode> children = new ArrayList<>();
+
+        public dictCategoryCode(String value, String info) {
+            this.value = value;
+            this.info = info;
+        }
+    }
+
     /**
      * 执行机构
      */
@@ -76,4 +98,5 @@ public class DiagnosisTreatmentInitDto {
             this.label = label;
         }
     }
+
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentSelParam.java

@@ -14,11 +14,12 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 public class DiagnosisTreatmentSelParam {
+
     /** 目录类别 */
-    private Integer categoryEnum;
+    private Integer categoryCode;
 
     /** 类型 */
-    private String typeCode;
+    private Integer typeEnum;
 
     /** 医保对码标记 */
     private Integer ybMatchFlag;

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java

@@ -5,11 +5,14 @@ import javax.validation.constraints.NotNull;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
 import com.openhis.common.enums.ActivityDefCategory;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
+
 /**
  * 诊疗目录分页更新
  *
@@ -19,13 +22,14 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 public class DiagnosisTreatmentUpDto {
+
     /** ID */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 目录类别 */
-    @NotNull(message = "目录类别不能为空")
+    @NotBlank(message = "目录类别不能为空")
-    private ActivityDefCategory categoryEnum;
+    private String categoryCode;
 
     /** 编码 */
     @NotBlank(message = "项目编码不能为空")
@@ -73,4 +77,36 @@ public class DiagnosisTreatmentUpDto {
 
     /** 规则id */
     private Integer ruleId;
+
+    /** 所属科室 */
+    @Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+    private String orgId_dictText;
+
+    /** 所在位置 */
+    @Dict(dictTable = "adm_location", dictCode = "id", dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+    private String locationId_dictText;
+
+    /** 财务类别 */
+    @Dict(dictCode = "fin_type_code")
+    private String itemTypeCode;
+    private String itemTypeCode_dictText;
+
+    /** 医保类别 */
+    @Dict(dictCode = "yb_type")
+    private String ybType;
+    private String ybType_dictText;
+
+    /** 购入价 */
+    private BigDecimal purchasePrice;
+
+    /** 零售价 */
+    private BigDecimal retailPrice;
+
+    /** 最高零售价 */
+    private BigDecimal maximumRetailPrice;
+
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageDto.java

@@ -50,8 +50,10 @@ public class DiseaseManageDto {
 
     /** 医保对码标记 */
     private Integer ybMatchFlag;
+    private String ybMatchFlag_enumText;
 
     /** 状态 */
-    private PublicationStatus statusEnum;
+    private Integer statusEnum;
+    private String statusEnum_enumText;
 
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemUpFromDirectoryDto.java

@@ -0,0 +1,74 @@
+package com.openhis.web.datadictionary.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.openhis.common.annotation.Dict;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 从目录添加定价表信息用的Dto
+ *
+ * @author liuhr
+ * @date 2025/3/28
+ */
+@Data
+@Accessors(chain = true)
+public class ItemUpFromDirectoryDto {
+
+    /** 药品单位 */
+    private String unitCode;
+
+    /** 购入价 */
+    private BigDecimal purchasePrice;
+
+    /** 零售价 */
+    private BigDecimal retailPrice;
+
+    /** 最高零售价 */
+    private BigDecimal maximumRetailPrice;
+
+    /** 名称 */
+    private String chargeName;
+
+    /** 状态 */
+    private Integer statusEnum;
+
+    /** 机构ID */
+    private Long orgId;
+
+    /** 代码 */
+    private String instanceTable;
+
+    /** 关联项目 */
+    private Long instanceId;
+
+    /** 有效时间开始 */
+    private Date effectiveStart;
+
+    /** 财务类别 */
+    private String typeCode;
+
+    /** 医保类别 */
+    private String ybType;
+
+    /** 是否使用详细价格规则 */
+    private Integer conditionFlag;
+
+    /** 基础价格 */
+    private BigDecimal price;
+
+    /** 费用定价主键ID */
+    private Long definitionId;
+
+    /** 条件 */
+    private String conditionCode;
+
+    /** 命中值 */
+    private String conditionValue;
+
+    /** 价格 */
+    private BigDecimal amount;
+
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java

@@ -6,11 +6,12 @@ import java.util.Date;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.annotation.Dict;
-import com.openhis.common.enums.PublicationStatus;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * 药品目录Dto
  *
@@ -30,15 +31,25 @@ public class MedicationManageDto {
     private Long medicationDefId;
 
     /** 药品状态 */
-//    private PublicationStatus statusEnum;
     private Integer statusEnum;
     private String statusEnum_enumText;
 
     /** 所属科室 */
+    @Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
+    private String orgId_dictText;
+
+    /** 所在位置 */
+    @Dict(dictTable = "adm_location", dictCode = "id", dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+    private String locationId_dictText;
 
     /** 剂型 */
+    @Dict(dictCode = "dose_form_code")
     private String doseFormCode;
+    private String doseFormCode_dictText;
 
     /** 规格 */
     private String totalVolume;
@@ -60,16 +71,22 @@ public class MedicationManageDto {
     private Date expirationDate;
 
     /** 用法 */
+    @Dict(dictCode = "method_code")
     private String methodCode;
+    private String methodCode_dictText;
 
     /** 用药频次 */
+    @Dict(dictCode = "rate_code")
     private String rateCode;
+    private String rateCode_dictText;
 
     /** 单次剂量 */
     private BigDecimal dose;
 
     /** 剂量单位 */
+    @Dict(dictCode = "unit_code")
     private String doseUnitCode;
+    private String doseUnitCode_dictText;
 
     /** 单次最大剂量 */
     private BigDecimal maxUnit;
@@ -77,6 +94,19 @@ public class MedicationManageDto {
     /** 药品定义 */
     private String definition;
 
+    /** 用量限定 */
+    private BigDecimal usageLimit;
+
+    /** DDD值 */
+    @Dict(dictCode = "ddd_code")
+    private String dddCode;
+    private String dddCode_dictText;
+
+    /** DDD单位 */
+    @Dict(dictCode = "unit_code")
+    private String dddUnitCode;
+    private String dddUnitCode_dictText;
+
     /** 药品编号 */
     private String busNo;
 
@@ -100,8 +130,9 @@ public class MedicationManageDto {
     private String wbStr;
 
     /** 药品分类 */
-    @Dict(dictCode = "medicine_category")
+    @Dict(dictCode = "med_category_code")
-    private Integer categoryCode;
+    private String categoryCode;
+    private String categoryCode_dictText;
 
     /** 商品名称 */
     private String merchandiseName;
@@ -113,28 +144,32 @@ public class MedicationManageDto {
     private String merchandiseWbStr;
 
     /** 药品单位 */
+    @Dict(dictCode = "unit_code")
     private String unitCode;
+    private String unitCode_dictText;
 
     /** 最小单位 */
+    @Dict(dictCode = "unit_code")
     private String minUnitCode;
+    private String minUnitCode_dictText;
 
     /** 所含耗材 */
     private String comprisedText;
 
-    /** 成分 */
-    private String ingredient;
-
     /** 拆零比 */
     private BigDecimal partPercent;
 
     /** 剂量形式 */
+    @Dict(dictCode = "dose_from_code")
     private Integer doseFrom;
+    private String doseFrom_dictText;
 
     /** 批准文号 */
     private String approvalNumber;
 
     /** 医保是否对码 */
     private Integer ybMatchFlag;
+    private String ybMatchFlag_enumText;;
 
     /** 医保编码 */
     private String ybNo;
@@ -143,31 +178,106 @@ public class MedicationManageDto {
     private String pharmacologyCategoryCode;
 
     /** 是否皮试 */
-    @Dict(dictCode = "sys_yes_no")
     private Integer skinTestFlag;
+    private String skinTestFlag_enumText;
 
     /** 是否为注射药物 */
-    @Dict(dictCode = "sys_yes_no")
     private Integer injectFlag;
+    private String injectFlag_enumText;
 
     /** 生产厂家 */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long manufacturerId;
 
     /** 供应商 */
+    @Dict(dictTable = "adm_supplier", dictCode = "id", dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long supplyId;
+    private String supplyId_dictText;
 
     /** 是否限制使用 */
-    @Dict(dictCode = "sys_yes_no")
     private Integer restrictedFlag;
+    private String restrictedFlag_enumText;
 
     /** 限制使用范围 */
     private String restrictedScope;
 
     /** 儿童用药标志 */
-    @Dict(dictCode = "sys_yes_no")
     private Integer childrenFlag;
+    private String childrenFlag_enumText;
 
     /** 产品特性 */
     private Integer characteristic;
+    private String characteristic_enumText;
+
+    /** 贯标国家编码 */
+    private String nationalDrugCode;
+
+    /** 拆分属性 */
+    private Integer partAttributeEnum;
+    private String partAttributeEnum_enumText;
+
+    /** 抗生素分类 */
+    @Dict(dictCode = "antibiotic_type_code")
+    private String antibioticCode;
+    private String antibioticCode_dictText;
+
+    /** 权限限制 */
+    private Integer restrictedEnum;
+    private String restrictedEnum_enumText;
+
+    /** 是否自制 */
+    private Integer selfFlag;
+    private String selfFlag_enumText;
+
+    /** 是否抗生素 */
+    private Integer antibioticFlag;
+    private String antibioticFlag_enumText;
+
+    /** 基药标识 */
+    private Integer basicFlag;
+    private String basicFlag_enumText;
+
+    /** 生产厂商文本 */
+    private String manufacturerText;
+
+    /** 当前库存数量(常规单位) */
+    private String baseQuantity;
+
+    /** 当前库存数量(最小单位数量) */
+    private String minQuantity;
+
+    /** 售价 */
+    private BigDecimal price;
+
+    /** 单次最小用药频次 */
+    private String minRateCode;
+
+    /** 单次最大用药频次 */
+    private String maxRateCode;
+
+    /** 医保类别 */
+    private String ybType;
+
+    /** 财务类别 */
+    @Dict(dictCode = "fin_type_code")
+    private String typeCode;
+    private String typeCode_dictText;
+
+    /** 成分 */
+    private String ingredient;
+
+    /** 购入价 */
+    private BigDecimal purchasePrice;
+
+    /** 零售价 */
+    private BigDecimal retailPrice;
+
+    /** 最高零售价 */
+    private BigDecimal maximumRetailPrice;
+
+    /** 住院临时医嘱拆分属性 */
+    private Integer thoPartAttributeEnum;
+    private String thoPartAttributeEnum_enumText;
 
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java

@@ -1,7 +1,10 @@
 package com.openhis.web.datadictionary.dto;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -16,6 +19,20 @@ import lombok.experimental.Accessors;
 public class MedicationManageInitDto {
     private List<statusEnumOption> statusFlagOptions;
     private List<domainEnumOption> domainFlagOptions;
+    // 供应商
+    private List<MedicationManageInitDto.supplierListOption> supplierListOptions;
+    // 药品类型
+    private List<MedicationManageInitDto.dictCategoryCode> medicationCategoryCodeOptions;
+    // 单位编码
+    private List<MedicationManageInitDto.dictCategoryCode> unitCodeOptions;
+    // 是/否 状态
+    private List<statusEnumOption> statusWeatherOptions;
+    // 权限限制
+    private List<statusEnumOption> statusRestrictedOptions;
+    // 拆分属性
+    private List<statusEnumOption> partAttributeEnumOptions;
+    //住院临时医嘱拆分属性
+    private List<statusEnumOption> tempOrderSplitPropertyEnumOptions;
 
     /**
      * 状态
@@ -44,4 +61,36 @@ public class MedicationManageInitDto {
             this.info = info;
         }
     }
+
+    /**
+     * 供应商
+     */
+    @Data
+    public static class supplierListOption {
+
+        @JsonSerialize(using = ToStringSerializer.class)
+        private Long value;
+        private String label;
+
+        public supplierListOption(Long value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+
+    /**
+     * 药品类型
+     */
+    @Data
+    public static class dictCategoryCode {
+        private String value;
+        private String info;
+        private List<dictCategoryCode> children = new ArrayList<>();
+
+        public dictCategoryCode(String value, String info) {
+            this.value = value;
+            this.info = info;
+        }
+    }
+
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java

@@ -4,10 +4,13 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 
+import com.openhis.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -30,8 +33,13 @@ public class MedicationManageUpDto {
     private Long medicationDefId;
 
     /** 所属科室 */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
+    /** 所在位置 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+
     /** 剂型 */
     private String doseFormCode;
 
@@ -48,9 +56,11 @@ public class MedicationManageUpDto {
     private String lotNumber;
 
     /** 生效日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private Date effectiveDate;
 
     /** 到期日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private Date expirationDate;
 
     /** 用法 */
@@ -63,7 +73,10 @@ public class MedicationManageUpDto {
     private BigDecimal dose;
 
     /** 剂量单位 */
+    @Dict(dictCode = "unit_code")
+    @NotBlank(message = "剂量单位不能为空")
     private String doseUnitCode;
+    private String doseUnitCode_dictText;
 
     /** 单次最大剂量 */
     private BigDecimal maxUnit;
@@ -72,7 +85,6 @@ public class MedicationManageUpDto {
     private String definition;
 
     /** 药品编号 */
-    @NotBlank(message = "药品编号不能为空")
     private String busNo;
 
     /** 药品名称 */
@@ -95,7 +107,7 @@ public class MedicationManageUpDto {
     private String wbStr;
 
     /** 药品分类 */
-    private Integer categoryCode;
+    private String categoryCode;
 
     /** 商品名称 */
     private String merchandiseName;
@@ -107,7 +119,9 @@ public class MedicationManageUpDto {
     private String merchandiseWbStr;
 
     /** 药品单位 */
+    @Dict(dictCode = "unit_code")
     private String unitCode;
+    private String unitCode_dictText;
 
     /** 最小单位 */
     private String minUnitCode;
@@ -122,7 +136,9 @@ public class MedicationManageUpDto {
     private BigDecimal partPercent;
 
     /** 剂量形式 */
+    @Dict(dictCode = "dose_from_code")
     private Integer doseFrom;
+    private String doseFrom_dictText;
 
     /** 批准文号 */
     private String approvalNumber;
@@ -143,9 +159,14 @@ public class MedicationManageUpDto {
     private Integer injectFlag;
 
     /** 生产厂家 */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long manufacturerId;
 
+    /** 生产厂商文本 */
+    private String manufacturerText;
+
     /** 供应商 */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long supplyId;
 
     /** 是否限制使用 */
@@ -160,4 +181,68 @@ public class MedicationManageUpDto {
     /** 产品特性 */
     private Integer characteristic;
 
+    /** 购入价 */
+    @NotNull(message = "购入价不能为空")
+    private BigDecimal purchasePrice;
+
+    /** 零售价 */
+    @NotNull(message = "零售价不能为空")
+    private BigDecimal retailPrice;
+
+    /** 最高零售价 */
+    @NotNull(message = "最高零售价不能为空")
+    private BigDecimal maximumRetailPrice;
+
+    /** 医保类别 */
+    private String ybType;
+
+    /** 财务类别 */
+    @Dict(dictCode = "fin_type_code")
+    private String typeCode;
+    private String typeCode_dictText;
+
+    /** 单次最小用药频次 */
+    private String minRateCode;
+
+    /** 单次最大用药频次 */
+    private String maxRateCode;
+
+    /** 药品状态 */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+    /** 拆分属性 */
+    private Integer partAttributeEnum;
+
+    /** 贯标国家编码 */
+    private String nationalDrugCode;
+
+    /** 是否抗生素 */
+    private Integer antibioticFlag;
+
+    /** 是否自制 */
+    private Integer selfFlag;
+
+    /** DDD值 */
+    private String dddCode;
+
+    /** DDD单位 */
+    private String dddUnitCode;
+
+    /** 用量限定 */
+    private BigDecimal usageLimit;
+
+    /** 抗生素分类 */
+    @Dict(dictCode = "antibiotic_type_code")
+    private String antibioticCode;
+    private String antibioticCode_dictText;
+
+    /** 权限限制 */
+    private Integer restrictedEnum;
+
+    /** 基药标识 */
+    private Integer basicFlag;
+
+    /** 住院临时医嘱拆分属性 */
+    private Integer thoPartAttributeEnum;
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationSearchParam.java

@@ -0,0 +1,22 @@
+package com.openhis.web.datadictionary.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 药品查询信息
+ *
+ * @author liuhr
+ * @date 2025/3/27
+ */
+@Data
+@Accessors(chain = true)
+public class MedicationSearchParam {
+
+    /** 医保是否对码 */
+    private Integer ybMatchFlag;
+    /** 药品状态 */
+    private Integer statusEnum;
+    /** 药品分类 */
+    private String categoryCode;
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -35,6 +36,7 @@ public class SupplierDto {
 
     /** 类型 */
     private Integer typeEnum;
+    private String typeEnum_enumText;
 
     /** 地址 */
     private String address;
@@ -57,5 +59,7 @@ public class SupplierDto {
 
     /** 机构编号 */
     @JsonSerialize(using = ToStringSerializer.class)
+    @Dict(dictTable = "adm_organization",dictCode = "id",dictText = "name")
     private Long orgId;
+    private String orgId_dictText;
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ActivityDefinitionManageMapper.java

@@ -0,0 +1,40 @@
+package com.openhis.web.datadictionary.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.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto;
+
+/**
+ * 诊疗定义管理
+ *
+ * @author liuhr
+ * @date 2025/3/28
+ */
+@Repository
+public interface ActivityDefinitionManageMapper {
+
+    /**
+     * 诊疗目录分页查询
+     *
+     * @param page 分页参数
+     * @param queryWrapper 查询条件
+     * @return 器材记录
+     */
+    IPage<DiagnosisTreatmentDto> getDiseaseTreatmentPage(@Param("page") Page<DiagnosisTreatmentDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<DiagnosisTreatmentDto> queryWrapper);
+
+    /**
+     * 诊疗详情
+     *
+     * @param id 诊疗ID
+     * @param tenantId 租户
+     * @return
+     */
+    DiagnosisTreatmentDto getDiseaseTreatmentOne(@Param("id") Long id, @Param("tenantId") Integer tenantId);
+
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/DeviceManageMapper.java

@@ -0,0 +1,42 @@
+package com.openhis.web.datadictionary.mapper;
+
+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.datadictionary.dto.DeviceManageDto;
+import com.openhis.web.datadictionary.dto.MedicationManageDto;
+import com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 器材目录
+ *
+ * @author Wuser
+ * @date 2025/3/26
+ */
+@Repository
+public interface DeviceManageMapper {
+
+    /**
+     * 器材目录分页查询
+     *
+     * @param page 分页参数
+     * @param queryWrapper 查询条件
+     * @return 器材记录
+     */
+    IPage<DeviceManageDto> getDevicePage(
+        @Param("page") Page<DeviceManageDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<DeviceManageDto> queryWrapper);
+
+    /**
+     * 器材详情
+     *
+     * @param id 器材ID
+     * @param tenantId 租户
+     * @return
+     */
+    DeviceManageDto getOne(@Param("id") Long id, @Param("tenantId") Integer tenantId);
+
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/MedicationManageSearchMapper.java

@@ -2,6 +2,11 @@ package com.openhis.web.datadictionary.mapper;
 
 import java.util.List;
 
+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.outpatientmanage.dto.OutpatientInfusionRecordDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -17,35 +22,18 @@ import com.openhis.web.datadictionary.dto.MedicationManageDto;
  */
 @Repository
 public interface MedicationManageSearchMapper extends BaseMapper<ChargeItemDefinition> {
-    /**
-     * 药品目录分页查询
-     * 
-     * @param searchKey 模糊查询条件
-     * @param ybMatchFlag 是否对码
-     * @param statusEnum 状态
-     * @param categoryCode 分类
-     * @param tenantId 租户
-     * @param pageSize
-     * @param offset
-     * @return
-     */
-    List<MedicationManageDto> getPage(@Param("searchKey") String searchKey, @Param("ybMatchFlag") Integer ybMatchFlag,
-        @Param("statusEnum") Integer statusEnum, @Param("categoryCode") String categoryCode,
-        @Param("tenantId") Integer tenantId, @Param("pageSize") Integer pageSize, @Param("offset") Integer offset);
 
     /**
      * 药品目录分页查询
      *
-     * @param searchKey 模糊查询条件
+     * @param page 分页
-     * @param ybMatchFlag 是否对码
+     * @param queryWrapper 查询条件
-     * @param statusEnum 状态
-     * @param categoryCode 分类
-     * @param tenantId 租户
      * @return
      */
-    Long getPageCount(@Param("searchKey") String searchKey, @Param("ybMatchFlag") Integer ybMatchFlag,
+    IPage<MedicationManageDto> getPage(
-        @Param("statusEnum") Integer statusEnum, @Param("categoryCode") String categoryCode,
+        @Param("page") Page<OutpatientInfusionRecordDto> page,
-        @Param("tenantId") Integer tenantId);
+        @Param(Constants.WRAPPER) QueryWrapper<MedicationManageDto> queryWrapper);
+
 
     /**
      * 药品详情

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java

@@ -1,7 +1,10 @@
 package com.openhis.web.doctorstation.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.core.common.core.domain.R;
 import com.openhis.web.doctorstation.dto.AdviceBaseDto;
+import com.openhis.web.doctorstation.dto.AdviceSaveDto;
+import com.openhis.web.doctorstation.dto.AdviceSaveParam;
 
 /**
  * 医生站-医嘱/处方 应用Service
@@ -21,4 +24,12 @@ public interface IDoctorStationAdviceAppService {
     IPage<AdviceBaseDto> getAdviceBaseInfo(AdviceBaseDto adviceBaseDto, String searchKey, Long locationId,
         Integer pageNo, Integer pageSize);
 
+    /**
+     * 门诊保存医嘱
+     *
+     * @param adviceSaveParam 医嘱表单信息
+     * @return 结果
+     */
+    R<?> saveAdvice(AdviceSaveParam adviceSaveParam);
+
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java

@@ -74,4 +74,20 @@ public interface IDoctorStationDiagnosisAppService {
      */
     R<?> getConditionDefinitionBusinessClass(Long patientId);
 
+    /**
+     * 查询就诊诊断信息
+     *
+     * @param encounterId 就诊id
+     * @return 就诊诊断信息
+     */
+    R<?> getEncounterDiagnosis(Long encounterId);
+
+    /**
+     * 删除就诊诊断信息
+     *
+     * @param conditionId 诊断ID
+     * @return 结果
+     */
+    R<?> delEncounterDiagnosis(Long conditionId);
+
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationEmrAppService.java

@@ -52,4 +52,10 @@ public interface IDoctorStationEmrAppService {
      */
     R<?> deleteEmrTemplate(Long id);
 
+    /**
+     * 获取病历详情
+     * @param encounterId 就诊id
+     * @return 病历详情
+     */
+    R<?> getEmrDetail(Long encounterId);
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java

@@ -1,9 +1,6 @@
 package com.openhis.web.doctorstation.appservice.impl;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
 import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
@@ -13,16 +10,27 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.AssignSeqUtil;
+import com.core.common.utils.MessageUtils;
+import com.openhis.administration.domain.ChargeItem;
+import com.openhis.administration.domain.OrganizationLocation;
+import com.openhis.administration.service.IChargeItemService;
+import com.openhis.administration.service.IOrganizationLocationService;
 import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.ActivityType;
+import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.ConditionCode;
+import com.openhis.common.enums.*;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.medication.domain.MedicationRequest;
+import com.openhis.medication.service.IMedicationRequestService;
 import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
-import com.openhis.web.doctorstation.dto.AdviceBaseDto;
+import com.openhis.web.doctorstation.dto.*;
-import com.openhis.web.doctorstation.dto.AdviceInventoryDto;
-import com.openhis.web.doctorstation.dto.AdvicePriceDto;
 import com.openhis.web.doctorstation.mapper.DoctorStationAdviceAppMapper;
+import com.openhis.workflow.domain.DeviceRequest;
+import com.openhis.workflow.domain.ServiceRequest;
+import com.openhis.workflow.service.IDeviceRequestService;
+import com.openhis.workflow.service.IServiceRequestService;
 
 /**
  * 医生站-医嘱/处方 应用实现类
@@ -30,9 +38,27 @@ import com.openhis.web.doctorstation.mapper.DoctorStationAdviceAppMapper;
 @Service
 public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAppService {
 
+    @Resource
+    AssignSeqUtil assignSeqUtil;
+
     @Resource
     DoctorStationAdviceAppMapper doctorStationAdviceAppMapper;
 
+    @Resource
+    IMedicationRequestService iMedicationRequestService;
+
+    @Resource
+    IDeviceRequestService iDeviceRequestService;
+
+    @Resource
+    IServiceRequestService iServiceRequestService;
+
+    @Resource
+    IChargeItemService iChargeItemService;
+
+    @Resource
+    IOrganizationLocationService iOrganizationLocationService;
+
     /**
      * 查询医嘱信息
      *
@@ -52,7 +78,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         IPage<AdviceBaseDto> adviceBaseInfo =
             doctorStationAdviceAppMapper.getAdviceBaseInfo(new Page<>(pageNo, pageSize),
                 CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
-                CommonConstants.TableName.WOR_ACTIVITY_DEFINITION, queryWrapper);
+                CommonConstants.TableName.WOR_ACTIVITY_DEFINITION, DeviceCategory.SINGLE_USE.getCode(), queryWrapper);
         List<AdviceBaseDto> adviceBaseDtoList = adviceBaseInfo.getRecords();
         // 医嘱定义ID集合
         List<Long> adviceDefinitionIdList =
@@ -63,73 +89,319 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         // 医嘱库存集合
         List<AdviceInventoryDto> adviceInventory = doctorStationAdviceAppMapper.getAdviceInventory(locationId,
             adviceDefinitionIdList, CommonConstants.SqlCondition.ABOUT_INVENTORY_TABLE_STR);
+        // TODO: 预减库存待处理
+
         // 费用定价子表信息
         List<AdvicePriceDto> childCharge = doctorStationAdviceAppMapper
-            .getChildCharge(ConditionCode.UNIT_PRODUCT_BATCH_NUM.getInfo(), chargeItemDefinitionIdList);
+            .getChildCharge(ConditionCode.UNIT_PRODUCT_BATCH_NUM.getCode(), chargeItemDefinitionIdList);
         // 费用定价主表信息
         List<AdvicePriceDto> mainCharge = doctorStationAdviceAppMapper.getMainCharge(chargeItemDefinitionIdList);
-        // 药品和耗材
+
-        List<AdviceBaseDto> medicationAndDeviceList = adviceBaseDtoList.stream()
-            .filter(e -> CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(e.getAdviceTableName())
-                || CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(e.getAdviceTableName()))
-            .collect(Collectors.toList());
-        // 药品和耗材-赋值
         String unitCode = ""; // 包装单位
-        String minUnitCode; // 小单位
         Long chargeItemDefinitionId; // 费用定价主表ID
-        for (AdviceBaseDto baseDto : medicationAndDeviceList) {
+        for (AdviceBaseDto baseDto : adviceBaseDtoList) {
-            // 每一条医嘱的库存集合信息
+            // 药品和耗材
+            if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(baseDto.getAdviceTableName())
+                || CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(baseDto.getAdviceTableName())) {
+                // 每一条医嘱的库存集合信息 , 包装单位库存前端计算
                 List<AdviceInventoryDto> inventoryList =
                     adviceInventory.stream().filter(e -> baseDto.getAdviceDefinitionId().equals(e.getItemId())
                         && baseDto.getAdviceTableName().equals(e.getItemTable())).collect(Collectors.toList());
                 // 库存信息
                 baseDto.setInventoryList(inventoryList);
-
                 unitCode = baseDto.getUnitCode();
-            minUnitCode = baseDto.getMinUnitCode();
                 chargeItemDefinitionId = baseDto.getChargeItemDefinitionId();
-
                 List<AdvicePriceDto> priceDtoList = new ArrayList<>();
-            // 库存信息里取 单位,产品批号 去匹配价格
+                // 库存信息里取 命中条件 去匹配价格
                 for (AdviceInventoryDto adviceInventoryDto : inventoryList) {
                     Long finalChargeItemDefinitionId = chargeItemDefinitionId;
                     String finalUnitCode = unitCode;
-                String finalMinUnitCode = minUnitCode;
                     // 匹配包装单位
                     List<AdvicePriceDto> advicePrice1 = childCharge.stream()
-                    .filter(e -> e.getDefinitionId().equals(finalChargeItemDefinitionId) && e.getConditionValue()
+                        .filter(e -> e.getDefinitionId().equals(finalChargeItemDefinitionId)
-                        .equals(String.format(CommonConstants.Common.COMMA_FORMAT, finalUnitCode,
+                            && e.getConditionValue().equals(adviceInventoryDto.getLotNumber()))
-                            adviceInventoryDto.getLotNumber())))
                         .peek(e -> e.setUnitCode(finalUnitCode)) // 设置 unitCode
                         .collect(Collectors.toList());
-                // 匹配最小单位
-                List<AdvicePriceDto> advicePrice2 = childCharge.stream()
-                    .filter(e -> e.getDefinitionId().equals(finalChargeItemDefinitionId) && e.getConditionValue()
-                        .equals(String.format(CommonConstants.Common.COMMA_FORMAT, finalMinUnitCode,
-                            adviceInventoryDto.getLotNumber())))
-                    .peek(e -> e.setUnitCode(finalMinUnitCode)) // 设置 unitCode
-                    .collect(Collectors.toList());
                     priceDtoList.addAll(advicePrice1);
-                priceDtoList.addAll(advicePrice2);
                 }
                 // 价格信息
                 baseDto.setPriceList(priceDtoList);
             }
-        // 诊疗
+            // 诊疗活动
-        List<AdviceBaseDto> activityList = adviceBaseDtoList.stream()
+            else if (CommonConstants.TableName.WOR_ACTIVITY_DEFINITION.equals(baseDto.getAdviceTableName())) {
-            .filter(e -> CommonConstants.TableName.WOR_ACTIVITY_DEFINITION.equals(e.getAdviceTableName()))
-            .collect(Collectors.toList());
-        // 诊疗-赋值
-        for (AdviceBaseDto baseDto : activityList) {
-            // 活动类型
-            baseDto.setActivityType_enumText(EnumUtils.getInfoByValue(ActivityType.class, baseDto.getActivityType()));
                 List<AdvicePriceDto> priceList =
                     mainCharge.stream().filter(e -> baseDto.getChargeItemDefinitionId().equals(e.getDefinitionId()))
                         .collect(Collectors.toList());
                 // 价格信息
                 baseDto.setPriceList(priceList);
+                // 活动类型
+                baseDto
+                    .setActivityType_enumText(EnumUtils.getInfoByValue(ActivityType.class, baseDto.getActivityType()));
             }
+        }
+
         return adviceBaseInfo;
+
+        // 下面的注释不要删除 2025.03.27
+        // // 药品和耗材
+        // List<AdviceBaseDto> medicationAndDeviceList = adviceBaseDtoList.stream()
+        // .filter(e -> CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(e.getAdviceTableName())
+        // || CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(e.getAdviceTableName()))
+        // .collect(Collectors.toList());
+        // // 药品和耗材-赋值
+        // String unitCode = ""; // 包装单位
+        // String minUnitCode; // 小单位
+        // Long chargeItemDefinitionId; // 费用定价主表ID
+        // for (AdviceBaseDto baseDto : medicationAndDeviceList) {
+        // // 每一条医嘱的库存集合信息
+        // List<AdviceInventoryDto> inventoryList =
+        // adviceInventory.stream().filter(e -> baseDto.getAdviceDefinitionId().equals(e.getItemId())
+        // && baseDto.getAdviceTableName().equals(e.getItemTable())).collect(Collectors.toList());
+        // // 库存信息
+        // baseDto.setInventoryList(inventoryList);
+        //
+        // unitCode = baseDto.getUnitCode();
+        // minUnitCode = baseDto.getMinUnitCode();
+        // chargeItemDefinitionId = baseDto.getChargeItemDefinitionId();
+        //
+        // List<AdvicePriceDto> priceDtoList = new ArrayList<>();
+        // // 库存信息里取 单位,产品批号 去匹配价格
+        // for (AdviceInventoryDto adviceInventoryDto : inventoryList) {
+        // Long finalChargeItemDefinitionId = chargeItemDefinitionId;
+        // String finalUnitCode = unitCode;
+        // String finalMinUnitCode = minUnitCode;
+        // // 匹配包装单位
+        // List<AdvicePriceDto> advicePrice1 = childCharge.stream()
+        // .filter(e -> e.getDefinitionId().equals(finalChargeItemDefinitionId) && e.getConditionValue()
+        // .equals(String.format(CommonConstants.Common.COMMA_FORMAT, finalUnitCode,
+        // adviceInventoryDto.getLotNumber())))
+        // .peek(e -> e.setUnitCode(finalUnitCode)) // 设置 unitCode
+        // .collect(Collectors.toList());
+        // // 匹配最小单位
+        // List<AdvicePriceDto> advicePrice2 = childCharge.stream()
+        // .filter(e -> e.getDefinitionId().equals(finalChargeItemDefinitionId) && e.getConditionValue()
+        // .equals(String.format(CommonConstants.Common.COMMA_FORMAT, finalMinUnitCode,
+        // adviceInventoryDto.getLotNumber())))
+        // .peek(e -> e.setUnitCode(finalMinUnitCode)) // 设置 unitCode
+        // .collect(Collectors.toList());
+        // priceDtoList.addAll(advicePrice1);
+        // priceDtoList.addAll(advicePrice2);
+        // }
+        // // 价格信息
+        // baseDto.setPriceList(priceDtoList);
+        // }
+        // // 诊疗
+        // List<AdviceBaseDto> activityList = adviceBaseDtoList.stream()
+        // .filter(e -> CommonConstants.TableName.WOR_ACTIVITY_DEFINITION.equals(e.getAdviceTableName()))
+        // .collect(Collectors.toList());
+        // // 诊疗-赋值
+        // for (AdviceBaseDto baseDto : activityList) {
+        // // 活动类型
+        // baseDto.setActivityType_enumText(EnumUtils.getInfoByValue(ActivityType.class, baseDto.getActivityType()));
+        // List<AdvicePriceDto> priceList =
+        // mainCharge.stream().filter(e -> baseDto.getChargeItemDefinitionId().equals(e.getDefinitionId()))
+        // .collect(Collectors.toList());
+        // // 价格信息
+        // baseDto.setPriceList(priceList);
+        // }
+
+    }
+
+    /**
+     * 门诊保存医嘱
+     *
+     * @param adviceSaveParam 医嘱表单信息
+     * @return 结果
+     */
+    @Override
+    public R<?> saveAdvice(AdviceSaveParam adviceSaveParam) {
+        // 医嘱分类信息
+        List<AdviceSaveDto> adviceSaveList = adviceSaveParam.getAdviceSaveList();
+        // TODO: 保存医嘱时规则校验;待做
+        // 药品
+        List<AdviceSaveDto> medicineList = adviceSaveList.stream()
+            .filter(e -> ItemType.MEDICINE.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
+        // 耗材
+        List<AdviceSaveDto> deviceList = adviceSaveList.stream()
+            .filter(e -> ItemType.DEVICE.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
+        // 诊疗活动
+        List<AdviceSaveDto> activityList = adviceSaveList.stream()
+            .filter(e -> ItemType.ACTIVITY.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
+        // 生成处方号 , 只有开了药品才有处方号
+        String prescriptionNo = "";
+        if (medicineList.size() > 0) {
+            // TODO: 药品分方;待做
+            prescriptionNo = assignSeqUtil.getSeq(AssignSeqEnum.PRESCRIPTION_NO.getPrefix(), 8);
+        }
+        // 声明费用项
+        ChargeItem chargeItem;
+        // 保存药品请求
+        MedicationRequest medicationRequest;
+        for (AdviceSaveDto adviceSaveDto : medicineList) {
+            medicationRequest = new MedicationRequest();
+            medicationRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 10));
+            medicationRequest.setPrescriptionNo(prescriptionNo); // 处方号
+            medicationRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
+            medicationRequest.setExecuteNum(adviceSaveDto.getExecuteNum()); // 执行次数
+            medicationRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
+            medicationRequest.setLotNumber(adviceSaveDto.getLotNumber()); // 产品批号
+            medicationRequest.setStatusEnum(adviceSaveDto.getStatusEnum()); // 请求状态,默认-待发送
+            medicationRequest.setCategoryEnum(adviceSaveDto.getCategoryEnum()); // 请求类型,默认-门诊
+            medicationRequest.setMedicationId(adviceSaveDto.getAdviceDefinitionId());// 医嘱定义id
+            medicationRequest.setPatientId(adviceSaveDto.getPatientId()); // 患者
+            medicationRequest.setPractitionerId(adviceSaveDto.getPractitionerId()); // 开方医生
+            medicationRequest.setOrgId(adviceSaveDto.getOrgId()); // 开方人科室
+            // 查询机构位置关系
+            OrganizationLocation orgLocByOrgIdAndCategoryCode = iOrganizationLocationService
+                .getOrgLocByOrgIdAndCategoryCode(adviceSaveDto.getOrgId(), adviceSaveDto.getCategoryCode());
+            if (orgLocByOrgIdAndCategoryCode != null) {
+                // 发放药房
+                medicationRequest.setPerformLocation(orgLocByOrgIdAndCategoryCode.getDefLocationId());
+            }
+            // medicationRequest.setLocationId(adviceSaveDto.getLocationId()); // 请求发起的位置
+            medicationRequest.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
+            medicationRequest.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
+            medicationRequest.setTherapyEnum(adviceSaveDto.getTherapyEnum()); // 治疗类型,默认-临时
+            medicationRequest.setMethodCode(adviceSaveDto.getMethodCode()); // 用法
+            medicationRequest.setRateCode(adviceSaveDto.getRateCode()); // 用药频次
+            medicationRequest.setDose(adviceSaveDto.getDose()); // 单次剂量
+            medicationRequest.setDoseUnitCode(adviceSaveDto.getDoseUnitCode()); // 剂量单位
+            medicationRequest.setDispensePerDuration(adviceSaveDto.getDispensePerDuration()); // 每次发药供应天数
+            medicationRequest.setSkinTestFlag(adviceSaveDto.getSkinTestFlag()); // 皮试标记
+            medicationRequest.setGroupId(adviceSaveDto.getGroupId());// 分组id
+            // medicationRequest.setPackageId(adviceSaveDto.getPackageId()); // 组套id
+
+            iMedicationRequestService.save(medicationRequest);
+
+            // 保存药品费用项
+            chargeItem = new ChargeItem();
+            chargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue()); // 默认-待收费
+            chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(medicationRequest.getBusNo()));
+            chargeItem.setPrescriptionNo(prescriptionNo); // 处方号
+            chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
+            chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
+            chargeItem.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
+            chargeItem.setDefinitionId(adviceSaveDto.getDefinitionId()); // 费用定价ID
+            chargeItem.setDefDetailId(adviceSaveDto.getDefinitionDetailId()); // 定价子表主键
+            chargeItem.setEntererId(adviceSaveDto.getPractitionerId());// 开立人ID
+            chargeItem.setEnteredDate(new Date()); // 开立时间
+            chargeItem.setServiceTable("med_medication_request");// 医疗服务类型
+            chargeItem.setServiceId(medicationRequest.getId()); // 医疗服务ID
+            chargeItem.setProductTable(adviceSaveDto.getAdviceTableName());// 产品所在表
+            chargeItem.setProductId(adviceSaveDto.getAdviceDefinitionId());// 收费项id
+            chargeItem.setAccountId(adviceSaveDto.getAccountId());// 关联账户ID
+
+            chargeItem.setQuantityValue(adviceSaveDto.getQuantity()); // 数量
+            chargeItem.setQuantityUnit(adviceSaveDto.getUnitCode()); // 单位
+            chargeItem.setUnitPrice(adviceSaveDto.getUnitPrice()); // 单价
+            chargeItem.setTotalPrice(adviceSaveDto.getTotalPrice()); // 总价
+
+            iChargeItemService.save(chargeItem);
+        }
+
+        // 保存耗材请求
+        DeviceRequest deviceRequest;
+        for (AdviceSaveDto adviceSaveDto : deviceList) {
+            deviceRequest = new DeviceRequest();
+            deviceRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 10));
+            // deviceRequest.setPrescriptionNo(prescriptionNo); // 耗材不需要处方号
+            deviceRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
+            deviceRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
+            deviceRequest.setLotNumber(adviceSaveDto.getLotNumber());// 产品批号
+            deviceRequest.setStatusEnum(adviceSaveDto.getStatusEnum()); // 请求状态,默认-待发送
+            deviceRequest.setCategoryEnum(adviceSaveDto.getCategoryEnum()); // 请求类型,默认-门诊
+            deviceRequest.setDeviceDefId(adviceSaveDto.getAdviceDefinitionId());// 耗材定义id
+            deviceRequest.setPatientId(adviceSaveDto.getPatientId()); // 患者
+            deviceRequest.setRequesterId(adviceSaveDto.getPractitionerId()); // 开方医生
+            deviceRequest.setOrgId(adviceSaveDto.getOrgId());// 开方人科室
+            // 查询机构位置关系
+            OrganizationLocation orgLocByOrgIdAndCategoryCode = iOrganizationLocationService
+                .getOrgLocByOrgIdAndCategoryCode(adviceSaveDto.getOrgId(), adviceSaveDto.getCategoryCode());
+            if (orgLocByOrgIdAndCategoryCode != null) {
+                // 发放耗材房
+                deviceRequest.setPerformLocation(orgLocByOrgIdAndCategoryCode.getDefLocationId());
+            }
+            // deviceRequest.setLocationId(adviceSaveDto.getLocationId()); 请求发起的位置
+            deviceRequest.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
+            // deviceRequest.setPackageId(adviceSaveDto.getPackageId()); // 组套id
+            // deviceRequest.setActivityId(adviceSaveDto.getActivityId());
+
+            iDeviceRequestService.save(deviceRequest);
+
+            // 保存耗材费用项
+            chargeItem = new ChargeItem();
+            chargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue()); // 默认-待收费
+            chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(deviceRequest.getBusNo()));
+            chargeItem.setPrescriptionNo(prescriptionNo); // 处方号
+            chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
+            chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
+            chargeItem.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
+            chargeItem.setDefinitionId(adviceSaveDto.getDefinitionId()); // 费用定价ID
+            chargeItem.setDefDetailId(adviceSaveDto.getDefinitionDetailId()); // 定价子表主键
+            chargeItem.setEntererId(adviceSaveDto.getPractitionerId());// 开立人ID
+            chargeItem.setEnteredDate(new Date()); // 开立时间
+            chargeItem.setServiceTable("wor_device_request");// 医疗服务类型
+            chargeItem.setServiceId(deviceRequest.getId()); // 医疗服务ID
+            chargeItem.setProductTable(adviceSaveDto.getAdviceTableName());// 产品所在表
+            chargeItem.setProductId(adviceSaveDto.getAdviceDefinitionId());// 收费项id
+            chargeItem.setAccountId(adviceSaveDto.getAccountId());// 关联账户ID
+
+            chargeItem.setQuantityValue(adviceSaveDto.getQuantity()); // 数量
+            chargeItem.setQuantityUnit(adviceSaveDto.getUnitCode()); // 单位
+            chargeItem.setUnitPrice(adviceSaveDto.getUnitPrice()); // 单价
+            chargeItem.setTotalPrice(adviceSaveDto.getTotalPrice()); // 总价
+
+            iChargeItemService.save(chargeItem);
+        }
+
+        // 保存诊疗项目请求
+        ServiceRequest serviceRequest;
+        for (AdviceSaveDto adviceSaveDto : activityList) {
+            serviceRequest = new ServiceRequest();
+            serviceRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 10));
+            // serviceRequest.setPrescriptionNo(prescriptionNo); // 诊疗不需要处方号
+            serviceRequest.setBasedOnTable(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION);
+            serviceRequest.setBasedOnId(adviceSaveDto.getAdviceDefinitionId());
+            serviceRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
+            serviceRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
+            serviceRequest.setStatusEnum(adviceSaveDto.getStatusEnum());// 请求状态,默认-待发送
+            serviceRequest.setCategoryEnum(adviceSaveDto.getCategoryEnum()); // 请求类型,默认-门诊
+            serviceRequest.setActivityId(adviceSaveDto.getAdviceDefinitionId());// 诊疗定义id
+            serviceRequest.setPatientId(adviceSaveDto.getPatientId()); // 患者
+            serviceRequest.setRequesterId(adviceSaveDto.getPractitionerId()); // 开方医生
+            serviceRequest.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
+
+            iServiceRequestService.save(serviceRequest);
+
+            // 保存诊疗费用项
+            chargeItem = new ChargeItem();
+            chargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue()); // 默认-待收费
+            chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
+            chargeItem.setPrescriptionNo(prescriptionNo); // 处方号
+            chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
+            chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
+            chargeItem.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
+            chargeItem.setDefinitionId(adviceSaveDto.getDefinitionId()); // 费用定价ID
+            chargeItem.setDefDetailId(adviceSaveDto.getDefinitionDetailId()); // 定价子表主键
+            chargeItem.setEntererId(adviceSaveDto.getPractitionerId());// 开立人ID
+            chargeItem.setEnteredDate(new Date()); // 开立时间
+            chargeItem.setServiceTable("wor_service_request");// 医疗服务类型
+            chargeItem.setServiceId(serviceRequest.getId()); // 医疗服务ID
+            chargeItem.setProductTable(adviceSaveDto.getAdviceTableName());// 产品所在表
+            chargeItem.setProductId(adviceSaveDto.getAdviceDefinitionId());// 收费项id
+            chargeItem.setAccountId(adviceSaveDto.getAccountId());// 关联账户ID
+
+            chargeItem.setQuantityValue(adviceSaveDto.getQuantity()); // 数量
+            chargeItem.setQuantityUnit(adviceSaveDto.getUnitCode()); // 单位
+            chargeItem.setUnitPrice(adviceSaveDto.getUnitPrice()); // 单价
+            chargeItem.setTotalPrice(adviceSaveDto.getTotalPrice()); // 总价
+
+            iChargeItemService.save(chargeItem);
+        }
+
+        // TODO: 此处调用请求发放接口
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"门诊医嘱"}));
     }
 
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java

@@ -26,10 +26,7 @@ import com.openhis.clinical.service.IConditionService;
 import com.openhis.clinical.service.IDiagnosisBelongBindingService;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.BindingType;
+import com.openhis.common.enums.*;
-import com.openhis.common.enums.ConditionDefinitionSource;
-import com.openhis.common.enums.PublicationStatus;
-import com.openhis.common.enums.Whether;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisPageUtils;
 import com.openhis.common.utils.HisQueryUtils;
@@ -66,6 +63,10 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
      */
     @Override
     public R<?> addDiagnosisBelongBinding(DiagnosisBelongBindingDto diagnosisBelongBindingDto) {
+        // 如果绑定类型是个人,objectId 存储当前登录账号id
+        if (BindingType.PERSONAL.getValue().equals(diagnosisBelongBindingDto.getBindingEnum())) {
+            diagnosisBelongBindingDto.setObjectId(SecurityUtils.getLoginUser().getUserId());
+        }
         DiagnosisBelongBinding diagnosisBelongBinding = new DiagnosisBelongBinding();
         BeanUtils.copyProperties(diagnosisBelongBindingDto, diagnosisBelongBinding);
         // 校验是否重复新增
@@ -88,6 +89,10 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
      */
     @Override
     public R<?> updateDiagnosisBelongBinding(DiagnosisBelongBindingDto diagnosisBelongBindingDto) {
+        // 如果绑定类型是个人,objectId 存储当前登录账号id
+        if (BindingType.PERSONAL.getValue().equals(diagnosisBelongBindingDto.getBindingEnum())) {
+            diagnosisBelongBindingDto.setObjectId(SecurityUtils.getLoginUser().getUserId());
+        }
         DiagnosisBelongBinding diagnosisBelongBinding = new DiagnosisBelongBinding();
         BeanUtils.copyProperties(diagnosisBelongBindingDto, diagnosisBelongBinding);
         // 校验是否重复编辑
@@ -240,6 +245,46 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
         return R.ok(conditionDefinitionBusinessClass);
     }
 
+    /**
+     * 查询就诊诊断信息
+     *
+     * @param encounterId 就诊id
+     * @return 就诊诊断信息
+     */
+    @Override
+    public R<?> getEncounterDiagnosis(Long encounterId) {
+        List<DiagnosisQueryDto> encounterDiagnosis = doctorStationDiagnosisAppMapper.getEncounterDiagnosis(encounterId);
+        for (DiagnosisQueryDto diagnosis : encounterDiagnosis) {
+            // 中医诊断/西医诊断
+            if (ConditionDefinitionSource.TRADITIONAL_CHINESE_MEDICINE_DIAGNOSIS.getValue()
+                .equals(diagnosis.getSourceEnum())
+                || ConditionDefinitionSource.TRADITIONAL_CHINESE_MEDICINE_SYNDROME_CATALOG.getValue()
+                    .equals(diagnosis.getSourceEnum())) {
+                diagnosis.setTypeName(CommonConstants.BusinessName.TCM_DIAGNOSIS);
+            } else {
+                diagnosis.setTypeName(CommonConstants.BusinessName.WESTERN_MEDICINE_DIAGNOSIS);
+            }
+            // 验证状态
+            diagnosis.setVerificationStatusEnum_enumText(
+                EnumUtils.getInfoByValue(ConditionVerificationStatus.class, diagnosis.getVerificationStatusEnum()));
+        }
+        return R.ok(encounterDiagnosis);
+    }
+
+    /**
+     * 删除就诊诊断信息
+     *
+     * @param conditionId 诊断ID
+     * @return 结果
+     */
+    @Override
+    public R<?> delEncounterDiagnosis(Long conditionId) {
+        iConditionService.removeById(conditionId);
+        iEncounterDiagnosisService
+            .remove(new LambdaQueryWrapper<EncounterDiagnosis>().eq(EncounterDiagnosis::getConditionId, conditionId));
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[] {"就诊诊断信息"}));
+    }
+
     /**
      * 处理诊断定义元数据
      *

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java

@@ -13,8 +13,11 @@ import org.springframework.stereotype.Service;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.common.enums.BindingType;
 import com.openhis.document.domain.Emr;
 import com.openhis.document.domain.EmrDetail;
 import com.openhis.document.domain.EmrDict;
@@ -56,7 +59,16 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
         Emr emr = new Emr();
         BeanUtils.copyProperties(patientEmrDto, emr);
         String contextStr = patientEmrDto.getContextJson().toString();
-        boolean saveSuccess = emrService.save(emr.setContextJson(contextStr));
+        Emr patientEmr = emrService.getOne(new LambdaQueryWrapper<Emr>().eq(Emr::getEncounterId, emr.getEncounterId()));
+        boolean saveSuccess;
+        // 如果已经保存病历，再次保存走更新
+        if (patientEmr != null) {
+            saveSuccess = emrService.update(new LambdaUpdateWrapper<Emr>().eq(Emr::getEncounterId, emr.getEncounterId())
+                .set(Emr::getContextJson, contextStr));
+        } else {
+            saveSuccess =
+                emrService.save(emr.setContextJson(contextStr).setRecordId(SecurityUtils.getLoginUser().getUserId()));
+        }
         if (!saveSuccess) {
             return R.fail();
         }
@@ -69,14 +81,18 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
         // 遍历病历内容map
         for (Map.Entry<String, String> entry : emrContextMap.entrySet()) {
             EmrDetail emrDetail = new EmrDetail();
-            emrDetail.setEmrId(emr.getId());
             if (!emrDictList.isEmpty() && emrDictList.contains(entry.getKey())) {
+                emrDetail.setEmrId(emr.getId());
                 emrDetail.setEmrKey(entry.getKey());
                 emrDetail.setEmrValue(entry.getValue());
             }
             emrDetailList.add(emrDetail);
         }
-        boolean save = emrDetailService.saveBatch(emrDetailList);
+        boolean save = true;
+        if (!emrDictList.isEmpty()) {
+            save = emrDetailService.saveBatch(emrDetailList);
+        }
+
         return save ? R.ok() : R.fail();
     }
 
@@ -95,6 +111,18 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
         return R.ok(page);
     }
 
+    /**
+     * 获取病历详情
+     *
+     * @param encounterId 就诊id
+     * @return 病历详情
+     */
+    @Override
+    public R<?> getEmrDetail(Long encounterId) {
+        Emr emrDetail = emrService.getOne(new LambdaQueryWrapper<Emr>().eq(Emr::getEncounterId, encounterId));
+        return R.ok(emrDetail);
+    }
+
     /**
      * 保存病历模板
      *
@@ -104,7 +132,11 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
     @Override
     public R<?> addEmrTemplate(EmrTemplateDto emrTemplateDto) {
         EmrTemplate emrTemplate = new EmrTemplate();
+        String contextStr = emrTemplateDto.getContextJson().toString();
         BeanUtils.copyProperties(emrTemplateDto, emrTemplate);
+        // todo 获取当前登录用户的科室id
+        emrTemplate.setUserId(SecurityUtils.getLoginUser().getUserId());
+        emrTemplate.setContextJson(contextStr);
         return emrTemplateService.save(emrTemplate) ? R.ok() : R.fail();
     }
 
@@ -119,9 +151,14 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
     @Override
     public R<?> getEmrTemplate(EmrTemplateDto emrTemplateDto, Integer pageNo, Integer pageSize) {
         LambdaQueryWrapper<EmrTemplate> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.like(EmrTemplate::getTemplateName, emrTemplateDto.getTemplateName())
+        queryWrapper
-            .eq(EmrTemplate::getUseScopeCode, emrTemplateDto.getUseScopeCode())
+            .eq(EmrTemplate::getUseScopeCode, emrTemplateDto.getUseScopeCode());
-            .eq(EmrTemplate::getUserId, emrTemplateDto.getUserId());
+        if (emrTemplateDto.getTemplateName() != null){
+            queryWrapper.like(EmrTemplate::getTemplateName, emrTemplateDto.getTemplateName());
+        }
+        if (BindingType.PERSONAL.getValue().toString().equals(emrTemplateDto.getUseScopeCode())) {
+            queryWrapper.eq(EmrTemplate::getUserId, SecurityUtils.getLoginUser().getUserId());
+        }
         Page<EmrTemplate> emrTemplatePage = emrTemplateService.page(new Page<>(pageNo, pageSize), queryWrapper);
         return R.ok(emrTemplatePage);
     }

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java

@@ -53,6 +53,7 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
         // TODO: userId(当前登录账号ID) 和 currentUserOrganizationId(当前登录账号所属的科室ID) 待补充
         // 当前登录账号ID
         Long userId = SecurityUtils.getLoginUser().getUserId();
+        Long currentUserOrganizationId = SecurityUtils.getLoginUser().getOrgId();
         IPage<PatientInfoDto> patientInfo = doctorStationMainAppMapper.getPatientInfo(new Page<>(pageNo, pageSize),
             ParticipantType.ADMITTER.getCode(), ClinicalStatus.INACTIVE.getValue(), null, null, queryWrapper);
         patientInfo.getRecords().forEach(e -> {

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java

@@ -3,14 +3,12 @@
  */
 package com.openhis.web.doctorstation.controller;
 
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-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.doctorstation.appservice.IDoctorStationAdviceAppService;
 import com.openhis.web.doctorstation.dto.AdviceBaseDto;
+import com.openhis.web.doctorstation.dto.AdviceSaveParam;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -46,4 +44,15 @@ public class DoctorStationAdviceController {
             iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, searchKey, locationId, pageNo, pageSize));
     }
 
+    /**
+     * 门诊保存医嘱
+     * 
+     * @param adviceSaveParam 医嘱表单信息
+     * @return 结果
+     */
+    @PostMapping(value = "/save-advice")
+    public R<?> saveAdvice(@RequestBody AdviceSaveParam adviceSaveParam) {
+        return iDoctorStationAdviceAppService.saveAdvice(adviceSaveParam);
+    }
+
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationDiagnosisController.java

@@ -147,4 +147,27 @@ public class DoctorStationDiagnosisController {
         return iDoctorStationDiagnosisAppService.getConditionDefinitionBusinessClass(patientId);
     }
 
+    /**
+     * 查询就诊诊断信息
+     * 
+     * @param encounterId 就诊id
+     * @return 就诊诊断信息
+     */
+    @GetMapping(value = "/get-encounter-diagnosis")
+    public R<?> getEncounterDiagnosis(@RequestParam Long encounterId) {
+        return iDoctorStationDiagnosisAppService.getEncounterDiagnosis(encounterId);
+    }
+
+    /**
+     * 删除就诊诊断信息
+     *
+     * @param conditionId 诊断ID
+     * @return 结果
+     */
+    @DeleteMapping(value = "/encounter-diagnosis")
+    public R<?> delEncounterDiagnosis(@RequestParam Long conditionId) {
+        return iDoctorStationDiagnosisAppService.delEncounterDiagnosis(conditionId);
+    }
+
+
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationEmrController.java

@@ -51,6 +51,17 @@ public class DoctorStationEmrController {
         return iDoctorStationEmrAppService.getPatientEmrHistory(patientEmrDto, pageNo, pageSize);
     }
 
+    /**
+     * 获取患者病历详情
+     *
+     * @param encounterId 就诊id
+     * @return 病历详情
+     */
+    @GetMapping("/emr-detail")
+    public R<?> getEmrDetail(@RequestParam(value = "encounterId") Long encounterId) {
+        return iDoctorStationEmrAppService.getEmrDetail(encounterId);
+    }
+
     /**
      * 保存病历模板
      *
@@ -84,7 +95,7 @@ public class DoctorStationEmrController {
      * @return 操作结果
      */
     @DeleteMapping("emr-template")
-    public R<?> deleteEmrTemplate(@RequestParam Long id) {
+    public R<?> deleteEmrTemplate(@RequestParam(value = "id") Long id) {
         return iDoctorStationEmrAppService.deleteEmrTemplate(id);
     }
 

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java

@@ -1,5 +1,6 @@
 package com.openhis.web.doctorstation.dto;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -17,7 +18,18 @@ import lombok.experimental.Accessors;
 public class AdviceBaseDto {
 
     /** 医嘱类型 */
-    private String adviceType; // 1:药品 , 2: 耗材 , 3:项目
+    private Integer adviceType; // 1:药品 , 2: 耗材 , 3:项目
+
+    /**
+     * 医嘱详细分类
+     */
+    private String categoryCode;
+
+    /** 拆零比 */
+    private BigDecimal partPercent;
+
+    /** 拆分属性 */
+    private Integer partAttributeEnum;
 
     /** 医嘱定义ID */
     @JsonSerialize(using = ToStringSerializer.class)

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java

@@ -23,16 +23,16 @@ public class AdviceInventoryDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long itemId;
 
-    /** 当前库存数量(包装单位) */
+//    /** 当前库存数量(包装单位) */
-    private BigDecimal baseQuantity;
+//    private BigDecimal baseQuantity;
-
+//
-    /** 包装单位 */
+//    /** 包装单位 */
-    @Dict(dictCode = "unit_code")
+//    @Dict(dictCode = "unit_code")
-    private String baseUnitCode;
+//    private String baseUnitCode;
-    private String baseUnitCode_dictText;
+//    private String baseUnitCode_dictText;
-
+//
-    /** 当前库存数量(最小单位) */
+//    /** 当前库存数量(最小单位) */
-    private BigDecimal minQuantity;
+//    private BigDecimal minQuantity;
 
     /** 最小单位 */
     @Dict(dictCode = "unit_code")

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdvicePriceDto.java

@@ -25,6 +25,10 @@ public class AdvicePriceDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long definitionId;
 
+    /** 费用定价子表ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long definitionDetailId;
+
     /** 命中条件 */
     private String conditionCode;
 

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java

@@ -1,9 +1,13 @@
 package com.openhis.web.doctorstation.dto;
 
+import java.math.BigDecimal;
+
+import com.core.common.utils.SecurityUtils;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.enums.EncounterClass;
 import com.openhis.common.enums.RequestStatus;
+import com.openhis.common.enums.TherapyTimeType;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -16,7 +20,18 @@ import lombok.experimental.Accessors;
 public class AdviceSaveDto {
 
     /** 医嘱类型 */
-    private String adviceType; // 1:药品 , 2: 耗材 , 3:项目
+    private Integer adviceType; // 1:药品 , 2: 耗材 , 3:项目
+
+    /**
+     * 医嘱详细分类
+     */
+    private String categoryCode;
+
+    /** 拆零比 */
+    private BigDecimal partPercent;
+
+    /** 拆分属性 */
+    private Integer partAttributeEnum;
 
     /** 执行次数 */
     private Integer executeNum; // 当医嘱类型为药品时,选填
@@ -27,9 +42,26 @@ public class AdviceSaveDto {
     /** 请求数量 */
     private Integer quantity;
 
+    /** 每次发药供应天数 */
+    private Integer dispensePerDuration;
+
     /** 请求单位编码 */
     private String unitCode;
 
+    /** 单价 */
+    private BigDecimal unitPrice;
+
+    /** 总价 */
+    private BigDecimal totalPrice;
+
+    /** 费用定价主表ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long definitionId;
+
+    /** 费用定价子表ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long definitionDetailId;
+
     /** 产品批号 */
     private String lotNumber;
 
@@ -45,6 +77,11 @@ public class AdviceSaveDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long adviceDefinitionId;
 
+    /**
+     * 医嘱对应表名
+     */
+    private String adviceTableName;
+
     /** 患者 */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long patientId;
@@ -53,10 +90,14 @@ public class AdviceSaveDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long practitionerId;
 
-    /** 所属位置 */
+    /** 请求发起的位置 */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long locationId;
 
+    /** 发放位置 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long performLocation;
+
     /** 所属科室 */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
@@ -65,13 +106,51 @@ public class AdviceSaveDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long encounterId;
 
+    /**
+     * 账户id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long accountId;
+
+    /**
+     * 诊断ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long conditionId;
+
+    /** 治疗类型 */
+    private Integer therapyEnum;
+
+    /** 用法 */
+    private String methodCode;
+
+    /** 用药频次 */
+    private String rateCode;
+
+    /** 单次剂量 */
+    private BigDecimal dose;
+
+    /** 剂量单位 */
+    private String doseUnitCode;
+
+    /**
+     * 皮试标志 1:是 , 0:否
+     */
+    private Integer skinTestFlag;
+
+    /**
+     * 分组id , 一组药品共用一个id,前端传过来
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long groupId;
+
     /** 组套id */
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long packageId; // 该参数先预留出来
+    private Long packageId;
 
     /** 活动(项目)定义id */
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long activityId; // 该参数先预留出来
+    private Long activityId;
 
     /**
      * 设置默认值
@@ -79,6 +158,9 @@ public class AdviceSaveDto {
     public AdviceSaveDto() {
         this.statusEnum = RequestStatus.DRAFT.getValue();
         this.categoryEnum = EncounterClass.AMB.getValue();
+        this.therapyEnum = TherapyTimeType.TEMPORARY.getValue();
+        this.practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        this.orgId = SecurityUtils.getLoginUser().getOrgId(); // 开方人科室
     }
 
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java

@@ -0,0 +1,52 @@
+package com.openhis.web.doctorstation.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 诊断查询 dto
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@Accessors(chain = true)
+public class DiagnosisQueryDto {
+
+    /**
+     * 诊断ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long conditionId;
+
+    /**
+     * 诊断定义id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long definitionId;
+
+    /** 所属分类 */
+    private Integer sourceEnum;
+    /**
+     * 诊断类型(中医诊断或西医诊断)
+     */
+    private String typeName;
+
+    /** 诊断名称 */
+    private String name;
+
+    /**
+     * 主诊断标记 (1:是,0:否)
+     */
+    private Integer maindiseFlag;
+
+    /**
+     * 验证状态
+     */
+    private Integer verificationStatusEnum;
+    private String verificationStatusEnum_enumText;
+
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EmrTemplateDto.java

@@ -3,6 +3,7 @@
  */
 package com.openhis.web.doctorstation.dto;
 
+import com.alibaba.fastjson2.JSONObject;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -26,7 +27,7 @@ public class EmrTemplateDto implements Serializable {
     private String templateName;
 
     /** 模板类型 */
-    private String templateTypeEnum;
+    private String templateTypeCode;
 
     /** 使用范围 */
     @NotBlank
@@ -36,6 +37,6 @@ public class EmrTemplateDto implements Serializable {
     private Long userId;
 
     /** 病历内容 */
-    private String contextJson;
+    private JSONObject contextJson;
 
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientEmrDto.java

@@ -36,7 +36,6 @@ public class PatientEmrDto implements Serializable {
     private String emrStatus;
 
     /** 记录人 */
-    @NotNull
     private Long recordId;
 
 

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java

@@ -4,6 +4,7 @@ import java.util.Date;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -27,6 +28,12 @@ public class PatientInfoDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long patientId;
 
+    /**
+     * 账户id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long accountId;
+
     /**
      * 患者姓名
      */
@@ -70,4 +77,14 @@ public class PatientInfoDto {
      */
     private Integer allergyHistoryFlag;
 
+    /**
+     * 挂号时间
+     */
+    private Date registerTime;
+
+    /** 账户类型编码 */
+    @Dict(dictCode = "account_code")
+    private String typeCode;
+    private String typeCode_dictText;
+
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisChildParam.java

@@ -40,6 +40,7 @@ public class SaveDiagnosisChildParam {
     /**
      * 诊断ID - 用于存储 adm_encounter_diagnosis表
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long conditionId;
 
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java

@@ -26,12 +26,13 @@ public interface DoctorStationAdviceAppMapper {
      * @param medicationTableName 药品定义表名
      * @param deviceTableName 耗材定义表名
      * @param activityTableName 诊疗定义表名
+     * @param singleUse 单次消耗类 (耗材只查这类)
      * @param queryWrapper 查询条件
      * @return 医嘱信息
      */
     IPage<AdviceBaseDto> getAdviceBaseInfo(@Param("page") Page<AdviceBaseDto> page,
         @Param("medicationTableName") String medicationTableName, @Param("deviceTableName") String deviceTableName,
-        @Param("activityTableName") String activityTableName,
+        @Param("activityTableName") String activityTableName, @Param("singleUse") String singleUse,
         @Param(Constants.WRAPPER) QueryWrapper<AdviceBaseDto> queryWrapper);
 
     /**

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.openhis.web.doctorstation.dto.ConditionDefinitionMetadata;
 import com.openhis.web.doctorstation.dto.DiagnosisBelongBindingDto;
+import com.openhis.web.doctorstation.dto.DiagnosisQueryDto;
 
 /**
  * 医生站-诊断 应用Mapper
@@ -73,4 +74,12 @@ public interface DoctorStationDiagnosisAppMapper {
     List<ConditionDefinitionMetadata> getOrganizationList(@Param("statusEnum") Integer statusEnum,
         @Param("bindingEnum") Integer bindingEnum, @Param("currentUserOrganizationId") Long currentUserOrganizationId);
 
+    /**
+     * 查询就诊诊断信息
+     *
+     * @param encounterId 就诊id
+     * @return 就诊诊断信息
+     */
+    List<DiagnosisQueryDto> getEncounterDiagnosis(@Param("encounterId") Long encounterId);
+
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryDetailsAppService.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inventorymanage.appservice;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.openhis.web.inventorymanage.dto.*;
+
+/**
+ * 采购入库明细查询 service
+ *
+ * @author
+ * @date 2025-03-10
+ */
+public interface IInventoryDetailsAppService {
+
+    /**
+     * 采购入库查询
+     *
+     * @param purchaseInSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 采购入库查询分页列表
+     */
+    IPage<PurchaseInDetailDto> purchaseInGetPage(PurchaseInSearchParam purchaseInSearchParam, String searchKey,
+        Integer pageNo, Integer pageSize, HttpServletRequest request);
+
+    /**
+     * 领用出库查询
+     *
+     * @param requisitionOutSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 领用出库查询分页列表
+     */
+    IPage<RequisitionOutDetailDto> requisitionOutGetPage(RequisitionOutSearchParam requisitionOutSearchParam,
+        String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request);
+
+    /**
+     * 商品调拨查询
+     *
+     * @param requisitionOutSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 商品调拨查询分页列表
+     */
+    IPage<InventoryTransferDetailDto> inventoryTransferGetPage(RequisitionOutSearchParam requisitionOutSearchParam,
+        String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request);
+
+    /**
+     * 商品盘点查询
+     *
+     * @param requisitionOutSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 商品盘点查询分页列表
+     */
+    IPage<InventoryStockTakeDetailDto> inventoryStockTakeGetPage(RequisitionOutSearchParam requisitionOutSearchParam,
+        String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request);
+
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/InventoryDetailsAppServiceImpl.java

@@ -0,0 +1,138 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inventorymanage.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.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.inventorymanage.appservice.IInventoryDetailsAppService;
+import com.openhis.web.inventorymanage.dto.*;
+import com.openhis.web.inventorymanage.mapper.InventoryDetailsMapper;
+
+/**
+ * 采购入库明细查询 impl
+ *
+ * @author
+ * @date 2025-03-10
+ */
+@Service
+public class InventoryDetailsAppServiceImpl implements IInventoryDetailsAppService {
+
+    @Autowired
+    private InventoryDetailsMapper inventoryDetailsMapper;
+
+    /**
+     * 采购入库明细查询
+     *
+     * @param purchaseInSearchParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     * @return 采购入库明细分页列表
+     */
+    @Override
+    public IPage<PurchaseInDetailDto> purchaseInGetPage(PurchaseInSearchParam purchaseInSearchParam, String searchKey,
+        Integer pageNo, Integer pageSize, HttpServletRequest request) {
+
+        // 构建查询条件
+        // QueryWrapper<SupplyRequest> queryWrapper =
+        // HisQueryUtils.buildQueryWrapper(inventorySearchParam, searchKey, searchFields, request);
+        // 查询入库单据分页列表
+        // Page<InventoryReceiptPageDto> inventoryReceiptPage = purchaseInventoryMapper.selectInventoryReceiptPage(
+        // new Page<>(pageNo, pageSize), queryWrapper, SupplyType.PURCHASE_INVENTORY.getValue());
+        // return R.ok(inventoryReceiptPage);
+
+        QueryWrapper<PurchaseInSearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(purchaseInSearchParam,
+            searchKey, new HashSet<>(Arrays.asList("bus_no", "item_name", "item_no")), request);
+        Page<PurchaseInDetailDto> purchaseInInfo =
+            inventoryDetailsMapper.selectPurchaseInDetailsPage(new Page<>(pageNo, pageSize), queryWrapper);
+
+        return purchaseInInfo;
+    }
+
+    /**
+     * 领用出库明细查询
+     *
+     * @param requisitionOutSearchParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     * @return 领用出库明细分页列表
+     */
+    @Override
+    public IPage<RequisitionOutDetailDto> requisitionOutGetPage(RequisitionOutSearchParam requisitionOutSearchParam,
+        String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request) {
+
+        QueryWrapper<RequisitionOutSearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(requisitionOutSearchParam, searchKey,
+                new HashSet<>(Arrays.asList("bus_no", "item_name", "item_no")), request);
+
+        Page<RequisitionOutDetailDto> requisitionOutInfo =
+            inventoryDetailsMapper.selectRequisitionOutDetailsPage(new Page<>(pageNo, pageSize), queryWrapper);
+
+        return requisitionOutInfo;
+    }
+
+    /**
+     * 商品调拨明细查询
+     *
+     * @param requisitionOutSearchParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     * @return 商品调拨明细分页列表
+     */
+    @Override
+    public IPage<InventoryTransferDetailDto> inventoryTransferGetPage(
+        RequisitionOutSearchParam requisitionOutSearchParam, String searchKey, Integer pageNo, Integer pageSize,
+        HttpServletRequest request) {
+
+        QueryWrapper<RequisitionOutSearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(requisitionOutSearchParam, searchKey,
+                new HashSet<>(Arrays.asList("bus_no", "item_name", "item_no")), request);
+
+        Page<InventoryTransferDetailDto> inventoryTransferInfo =
+            inventoryDetailsMapper.selectInventoryTransferDetailsPage(new Page<>(pageNo, pageSize), queryWrapper);
+
+        return inventoryTransferInfo;
+    }
+
+    /**
+     * 商品调拨明细查询
+     *
+     * @param requisitionOutSearchParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     * @return 商品调拨明细分页列表
+     */
+    @Override
+    public IPage<InventoryStockTakeDetailDto> inventoryStockTakeGetPage(
+        RequisitionOutSearchParam requisitionOutSearchParam, String searchKey, Integer pageNo, Integer pageSize,
+        HttpServletRequest request) {
+
+        QueryWrapper<RequisitionOutSearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(requisitionOutSearchParam, searchKey,
+                new HashSet<>(Arrays.asList("bus_no", "item_name", "item_no")), request);
+
+        Page<InventoryStockTakeDetailDto> inventoryStockTakeInfo =
+            inventoryDetailsMapper.selectInventoryStockTakeDetailsPage(new Page<>(pageNo, pageSize), queryWrapper);
+
+        return inventoryStockTakeInfo;
+    }
+
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java

@@ -26,7 +26,10 @@ import com.openhis.administration.service.IPractitionerService;
 import com.openhis.administration.service.ISupplierService;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.*;
+import com.openhis.common.enums.AssignSeqEnum;
+import com.openhis.common.enums.SupplyCategory;
+import com.openhis.common.enums.SupplyStatus;
+import com.openhis.common.enums.SupplyType;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.inventorymanage.appservice.IPurchaseInventoryAppService;
@@ -83,18 +86,14 @@ public class PurchaseInventoryAppServiceImpl implements IPurchaseInventoryAppSer
         List<PurchaseInventoryInitDto.supplierListOption> supplierListOptions = supplierList.stream()
             .map(supplier -> new PurchaseInventoryInitDto.supplierListOption(supplier.getId(), supplier.getName()))
             .collect(Collectors.toList());
-        // 入库项目类型
-        List<PurchaseInventoryInitDto.itemTypeOption> itemTypeOptions = Stream.of(ItemType.values())
-            .map(itemType -> new PurchaseInventoryInitDto.itemTypeOption(itemType.getValue(), itemType.getInfo()))
-            .collect(Collectors.toList());
         // 审批状态
         List<PurchaseInventoryInitDto.supplyStatusOption> supplyStatusOptions = Stream.of(SupplyStatus.values())
             .map(supplyStatus -> new PurchaseInventoryInitDto.supplyStatusOption(supplyStatus.getValue(),
                 supplyStatus.getInfo()))
             .collect(Collectors.toList());
 
-        initDto.setSupplierListOptions(supplierListOptions).setItemTypeOptions(itemTypeOptions)
+        initDto.setSupplierListOptions(supplierListOptions).setPractitionerListOptions(practitionerListOptions)
-            .setPractitionerListOptions(practitionerListOptions).setSupplyStatusOptions(supplyStatusOptions);
+            .setSupplyStatusOptions(supplyStatusOptions);
 
         return R.ok(initDto);
     }

openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java

@@ -197,9 +197,9 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
             for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
 
                 // 根据产品批号，仓库和仓位 查询库存表信息
-                InventoryItem inventoryItem = inventoryItemService.selectInventoryByLotNumber(
+                InventoryItem inventoryItem =
-                        supplyItemDetailDto.getLotNumber(),supplyItemDetailDto.getSourceLocationId(),
+                    inventoryItemService.selectInventoryByLotNumber(supplyItemDetailDto.getLotNumber(),
-                        supplyItemDetailDto.getPurposeLocationStoreId());
+                        supplyItemDetailDto.getSourceLocationId(), supplyItemDetailDto.getPurposeLocationStoreId());
 
                 // 包装数量
                 BigDecimal baseQuantity = inventoryItem.getBaseQuantity();
@@ -209,18 +209,19 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                 if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
 
                     baseQuantity = baseQuantity.min(supplyItemDetailDto.getItemQuantity());
-                    minQuantity = minQuantity.min(supplyItemDetailDto.getPartPercent()
+                    minQuantity = minQuantity
-                            .multiply(supplyItemDetailDto.getItemQuantity()));
+                        .min(supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
 
                 } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
 
-                    baseQuantity = baseQuantity.min(supplyItemDetailDto.getItemQuantity().divide(
+                    baseQuantity = baseQuantity.min(supplyItemDetailDto.getItemQuantity()
-                            supplyItemDetailDto.getPartPercent(),RoundingMode.HALF_UP));
+                        .divide(supplyItemDetailDto.getPartPercent(), RoundingMode.HALF_UP));
                     minQuantity = minQuantity.min(supplyItemDetailDto.getItemQuantity());
 
                 }
                 // 更新库存数量
-                inventoryItemService.updateInventoryQuantity(inventoryItem.getId(),baseQuantity,minQuantity,loginUser,now);
+                inventoryItemService.updateInventoryQuantity(inventoryItem.getId(), baseQuantity, minQuantity,
+                    loginUser, now);
             }
 
             // 将供应项目的详细信息装配为库存项目和采购账单
@@ -295,6 +296,7 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
         List<ItemChargeDetailDto> chargeDetailList) {
         List<ChargeItemDefDetail> resultList = new ArrayList<>();
 
+        // todo：同一批次不能改价
         // 将各个项目的定价信息按项目id分组
         Map<Long, List<ItemChargeDetailDto>> chargeDetailGroup =
             chargeDetailList.stream().collect(Collectors.groupingBy(ItemChargeDetailDto::getInstanceId));
@@ -356,7 +358,7 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
      */
     private ChargeItemDefDetail addChargeItemDefApp(String conditionValue, BigDecimal sellPrice, Long definitionId) {
         ChargeItemDefDetail chargeItemDefDetail = new ChargeItemDefDetail();
-        // todo：命中条件或建成字典枚举，此处为批次号，单位
+        // todo：命中条件或建成字典枚举，此处为批次号，单位，优先级加一
         chargeItemDefDetail
             // 命中值
             .setConditionValue(conditionValue)