器材目录up

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

@@ -13,6 +13,8 @@ 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;
@@ -74,6 +76,9 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
     @Autowired
     private IItemDefinitionService itemDefinitionServic;
 
+    @Autowired
+    private ISupplierService supplierService;
+
     @Autowired(required = false)
     AssignSeqUtil assignSeqUtil;
 
@@ -93,14 +98,14 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
             .collect(Collectors.toList());
         deviceManageInitDto.setStatusFlagOptions(statusEnumOptions);
 
-        // 获取执行科室
+//        // 获取执行科室
-        LambdaQueryWrapper<Organization> queryWrapper = new LambdaQueryWrapper<>();
+//        LambdaQueryWrapper<Organization> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(Organization::getTypeEnum, OrganizationType.HOSPITAL_DEPARTMENT);
+//        queryWrapper.eq(Organization::getTypeEnum, OrganizationType.HOSPITAL_DEPARTMENT);
-        List<Organization> organizations = organizationService.list(queryWrapper);
+//        List<Organization> organizations = organizationService.list(queryWrapper);
-        List<DeviceManageInitDto.exeOrganization> exeOrganizations = organizations.stream()
+//        List<DeviceManageInitDto.exeOrganization> exeOrganizations = organizations.stream()
-            .map(exeOrg -> new DeviceManageInitDto.exeOrganization(exeOrg.getId(), exeOrg.getName()))
+//            .map(exeOrg -> new DeviceManageInitDto.exeOrganization(exeOrg.getId(), exeOrg.getName()))
-            .collect(Collectors.toList());
+//            .collect(Collectors.toList());
-        deviceManageInitDto.setExeOrganizations(exeOrganizations);
+//        deviceManageInitDto.setExeOrganizations(exeOrganizations);
         // // 从枚举中获取器材分类
         // List<DeviceManageInitDto.deviceCategory> deviceCategories = Stream.of(DeviceCategory.values())
         // .map(category -> new DeviceManageInitDto.deviceCategory(category.getValue(), category.getInfo()))
@@ -108,10 +113,10 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
         // deviceManageInitDto.setDeviceCategories(deviceCategories);
 
         // 获取器材
-        List<SysDictData> devicelList =
+        List<SysDictData> deviceList =
             sysDictTypeService.selectDictDataByType(CommonConstants.DictName.DEVICE_CATEGORY_CODE);
         // 从字典中获取器材分类
-        List<DeviceManageInitDto.dictCategoryCode> deviceCategories = devicelList.stream()
+        List<DeviceManageInitDto.dictCategoryCode> deviceCategories = deviceList.stream()
             .map(category -> new DeviceManageInitDto.dictCategoryCode(category.getDictValue(), category.getDictLabel()))
             .collect(Collectors.toList());
         deviceManageInitDto.setDeviceCategories(deviceCategories);
@@ -122,6 +127,14 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
             .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);
     }
 

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

@@ -112,7 +112,7 @@ 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);

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

@@ -133,13 +133,23 @@ public class DeviceManageDto {
     private Integer allergenFlag;
     private String allergenFlag_enumText;
 
-    /** 售价 */
-    private BigDecimal price;
-
     /** 财务类别 */
+    @Dict(dictCode = "fin_type_code")
     private String itemTypeCode;
+    private String itemTypeCode_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/DeviceManageSelParam.java

@@ -21,5 +21,5 @@ public class DeviceManageSelParam {
 
     /** 状态 */
     private Integer statusEnum;
-    
+
 }

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

@@ -124,11 +124,6 @@ public class DeviceManageUpDto {
     @NotBlank(message = "适用范围不能为空")
     private String jurisdiction;
 
-    /** 执行科室 */
-    @NotNull(message = "执行科室不能为空")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long ruleId;
-
     /** 器材版本 */
     private String version;
 
@@ -155,8 +150,7 @@ public class DeviceManageUpDto {
     private String itemTypeCode;
 
     /** 医保类别 */
-    @NotNull(message = "财务类别不能为空")
+    @NotNull(message = "医保类别不能为空")
     private String ybType;
 
-
 }

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

@@ -2,6 +2,7 @@ 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;
 
@@ -45,7 +46,9 @@ public class DiagnosisTreatmentDto {
     private String typeEnum_enumText;
 
     /** 使用单位 */
+    @Dict(dictCode = "rate_code")
     private String permittedUnitCode;
+    private String permittedUnitCode_dictText;
 
     /** 医保标记 */
     private Integer ybFlag;
@@ -74,15 +77,38 @@ public class DiagnosisTreatmentDto {
     /** 规则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;
 
     /** 售价 */
     private BigDecimal price;
 
+    /** 财务类别 */
+    @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/mapper/DeviceManageMapper.java

@@ -8,6 +8,7 @@ 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;
 
 /**
  * 器材目录
@@ -15,6 +16,7 @@ import org.apache.ibatis.annotations.Param;
  * @author Wuser
  * @date 2025/3/26
  */
+@Repository
 public interface DeviceManageMapper {
 
     /**