服务管理查询调整

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

@@ -105,9 +105,12 @@ public class HealthcareServiceController {
                 new HashSet<>(Arrays.asList("name", "charge_name")), request);
         IPage<HealthcareServiceDto> healthcareServicePage = healthcareServiceBizMapper.getHealthcareServicePage(
                 new Page<>(pageNo, pageSize), CommonConstants.TableName.ADM_HEALTHCARE_SERVICE, queryWrapper);
+        healthcareServicePage.getRecords().forEach(e -> {
                     // 活动标记-枚举类回显赋值
-        healthcareServicePage.getRecords().forEach(e ->
-                e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag()))
+                    e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag()));
+                    // 预约要求-枚举类回显赋值
+                    e.setAppointmentRequiredFlag_enumText(EnumUtils.getInfoByValue(WhetherContainUnknown.class, e.getAppointmentRequiredFlag()));
+                }
         );
         return R.ok(healthcareServicePage, MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null));
     }

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

@@ -82,6 +82,7 @@ public class HealthcareServiceDto {
      * 预约要求
      */
     private Integer appointmentRequiredFlag;
+    private String appointmentRequiredFlag_enumText;
 
     /**
      * 名称

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

@@ -0,0 +1,22 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.outpatientservice.controller;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 门诊挂号 controller
+ */
+@RestController
+@RequestMapping("/outpatient-service/register")
+@Slf4j
+@AllArgsConstructor
+public class OutpatientRegistrationController {
+
+
+
+}