up

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/impl/DeviceManageAppServiceImpl.java

@@ -175,7 +175,7 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
      * @return 器材目录查询结果
      */
     @Override
-    public R<?> getDeviceOne(@PathVariable("id") Long id) {
+    public R<?> getDeviceOne(@RequestParam Long id) {
         // 根据ID查询【器材目录】
         DeviceDefinition byId = deviceDefinitionService.getById(id);
         return R.ok(byId);

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

@@ -120,12 +120,18 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
             .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());
+
         medicationManageInitDto.setStatusFlagOptions(statusEnumOptions);
         medicationManageInitDto.setDomainFlagOptions(domainEnumOptions);
         medicationManageInitDto.setSupplierListOptions(supplierListOptions);
         medicationManageInitDto.setMedicationCategoryCodeOptions(medicationCategories);
         medicationManageInitDto.setStatusWeatherOptions(statusWeatherOption);
         medicationManageInitDto.setStatusRestrictedOptions(statusRestrictedOptions);
+        medicationManageInitDto.setPartAttributeEnumOptions(partAttributeEnumOptions);
 
         return R.ok(medicationManageInitDto);
     }

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

@@ -118,7 +118,7 @@ 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查询【器材目录】

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

@@ -27,6 +27,8 @@ public class MedicationManageInitDto {
     private List<statusEnumOption> statusWeatherOptions;
     // 权限限制
     private List<statusEnumOption> statusRestrictedOptions;
+    // 拆分属性
+    private List<statusEnumOption> partAttributeEnumOptions;
 
     /**
      * 状态

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

@@ -234,7 +234,9 @@ public class MedicationManageUpDto {
     /** 用量限定 */
     private BigDecimal usageLimit;
 
+    /** 抗生素分类 */
+    @Dict(dictCode = "antibiotic_type_code")
+    private String antibioticCode;
+    private String antibioticCode_dictText;
 
-
-    /** 系统类别???? */
 }

openhis-server/openhis-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml

@@ -10,7 +10,7 @@
         T3.name,
         T3.py_str,
         T3.wb_str,
-        T3.category_enum,
+        T3.category_code,
         T3.type_code,
         T3.unit_code,
         T3.size,
@@ -44,7 +44,7 @@
             T1.name,
             T1.py_str,
             T1.wb_str,
-            T1.category_enum,
+            T1.category_code,
             T1.type_code,
             T1.unit_code,
             T1.size,