服务管理-部分

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

@@ -6,22 +6,25 @@ package com.openhis.web.basicservice.controller;
 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.openhis.administration.domain.ChargeItemDefinition;
+import com.openhis.administration.domain.HealthcareService;
 import com.openhis.administration.domain.Location;
 import com.openhis.administration.mapper.LocationMapper;
+import com.openhis.administration.service.IChargeItemDefinitionService;
 import com.openhis.administration.service.IHealthcareServiceService;
 import com.openhis.common.enums.AccountStatus;
+import com.openhis.common.enums.WhetherContainUnknown;
 import com.openhis.common.utils.HisPageUtils;
 import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.medication.domain.Medication;
 import com.openhis.medication.domain.MedicationQueryDto;
+import com.openhis.web.basicservice.dto.HealthcareServiceAddOrUpdateParam;
 import com.openhis.web.basicservice.dto.HealthcareServiceInitDto;
 import com.openhis.web.basicservice.mapper.HealthcareServiceBizMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -39,6 +42,9 @@ import java.util.stream.Stream;
 public class HealthcareServiceController {
 
     private final IHealthcareServiceService iHealthcareServiceService;
+    private final IChargeItemDefinitionService iChargeItemDefinitionService;
+
+
     private final HealthcareServiceBizMapper healthcareServiceBizMapper;
     private final LocationMapper locationMapper;
 
@@ -66,8 +72,28 @@ public class HealthcareServiceController {
                 .map(location -> new HealthcareServiceInitDto.locationIdOption(location.getId(), location.getName()))
                 .collect(Collectors.toList());
         healthcareServiceInitDto.setLocationIdOptions(locationIdOptions);
+        // 是否需要预约
+        List<HealthcareServiceInitDto.appointmentRequiredFlagOption> appointmentRequiredFlagOptions = Stream.of(WhetherContainUnknown.values())
+                .map(wh -> new HealthcareServiceInitDto.appointmentRequiredFlagOption(wh.getValue(), wh.getInfo()))
+                .collect(Collectors.toList());
+        healthcareServiceInitDto.setAppointmentRequiredFlagOptions(appointmentRequiredFlagOptions);
         return R.ok(healthcareServiceInitDto);
     }
 
+    /**
+     * 服务管理 新增
+     */
+    @PostMapping(value = "/healthcare-service")
+    public R<?> add(@Validated @RequestBody HealthcareServiceAddOrUpdateParam healthcareServiceAddOrUpdateParam){
+        // 服务管理-表单数据
+        HealthcareService healthcareServiceFormData = healthcareServiceAddOrUpdateParam.getHealthcareServiceFormData();
+        // 费用定价-表单数据
+        ChargeItemDefinition chargeItemDefinitionFormData = healthcareServiceAddOrUpdateParam.getChargeItemDefinitionFormData();
+        // 服务管理-新增
+        HealthcareService healthcareService = iHealthcareServiceService.addHealthcareService(healthcareServiceFormData);
+
+        return null;
+    }
+
 
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceAddOrUpdateParam.java

@@ -0,0 +1,25 @@
+package com.openhis.web.basicservice.dto;
+
+import com.openhis.administration.domain.ChargeItemDefinition;
+import com.openhis.administration.domain.HealthcareService;
+import lombok.Data;
+
+/**
+ * 服务项目管理 新增修改参数类
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+public class HealthcareServiceAddOrUpdateParam{
+    /**
+     *  服务管理
+     */
+    private HealthcareService healthcareServiceFormData;
+
+    /**
+     *  费用定价
+     */
+    private ChargeItemDefinition chargeItemDefinitionFormData;
+
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java

@@ -15,6 +15,7 @@ public class HealthcareServiceInitDto {
 
     private List<activeFlagOption> activeFlagOptions;
     private List<locationIdOption> locationIdOptions;
+    private List<appointmentRequiredFlagOption> appointmentRequiredFlagOptions;
 
 
     /**
@@ -45,4 +46,18 @@ public class HealthcareServiceInitDto {
         }
     }
 
+    /**
+     * 是否需要预约
+     */
+    @Data
+    public static class appointmentRequiredFlagOption {
+        private Integer value;
+        private String label;
+
+        public appointmentRequiredFlagOption(Integer value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+    }
+
 }