服务管理调整

openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/appservice/IOutpatientRegistrationAppService.java

@@ -1,12 +1,9 @@
-package com.openhis.web.outpatientservice.controller.appservice;
+package com.openhis.web.outpatientservice.appservice;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.openhis.web.outpatientservice.dto.PatientMetadata;
 
-/**
+public interface IOutpatientRegistrationAppService {
- * 门诊挂号 Service
- */
-public interface IOutpatientRegistrationService {
 
     /**
      * 门诊挂号 - 查询患者信息
@@ -17,5 +14,4 @@ public interface IOutpatientRegistrationService {
      * @return 患者信息
      */
     Page<PatientMetadata> getPatientMetadataBySearchKey(String searchKey, Integer pageNo, Integer pageSize);
-
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/appservice/impl/IOutpatientRegistrationAppServiceImpl.java

@@ -1,5 +1,4 @@
-package com.openhis.web.outpatientservice.controller.appservice.impl;
+package com.openhis.web.outpatientservice.appservice.impl;
-
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,7 +9,7 @@ import com.openhis.common.enums.AdministrativeGender;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisPageUtils;
 import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.outpatientservice.controller.appservice.IOutpatientRegistrationService;
+import com.openhis.web.outpatientservice.appservice.IOutpatientRegistrationAppService;
 import com.openhis.web.outpatientservice.dto.PatientMetadata;
 import org.springframework.stereotype.Service;
 
@@ -22,7 +21,7 @@ import java.util.HashSet;
  * 门诊挂号 实现类
  */
 @Service
-public class IOutpatientRegistrationServiceImpl implements IOutpatientRegistrationService {
+public class IOutpatientRegistrationAppServiceImpl implements IOutpatientRegistrationAppService {
 
     @Resource
     PatientMapper patientMapper;
@@ -57,3 +56,4 @@ public class IOutpatientRegistrationServiceImpl implements IOutpatientRegistrati
     }
 
 }
+

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

@@ -5,7 +5,8 @@ package com.openhis.web.outpatientservice.controller;
 
 import com.core.common.core.domain.R;
 import com.openhis.common.enums.PriorityLevel;
-import com.openhis.web.outpatientservice.controller.appservice.IOutpatientRegistrationService;
+import com.openhis.web.basedatamanage.appservice.IOrganizationAppService;
+import com.openhis.web.outpatientservice.appservice.IOutpatientRegistrationAppService;
 import com.openhis.web.outpatientservice.dto.OutpatientRegistrationInitDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -27,10 +28,11 @@ import java.util.stream.Stream;
 @AllArgsConstructor
 public class OutpatientRegistrationController {
 
-    private final IOutpatientRegistrationService iOutpatientRegistrationService;
+    private final IOutpatientRegistrationAppService iOutpatientRegistrationAppService;
+    private final IOrganizationAppService iOrganizationAppService;
 
     /**
-     * 门诊挂号基础数据初始化
+     * 门诊挂号 - 基础数据初始化
      */
     @GetMapping(value = "/init")
     public R<?> init() {
@@ -55,7 +57,21 @@ public class OutpatientRegistrationController {
     public R<?> getPatientMetadata(@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
                                    @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
-        return R.ok(iOutpatientRegistrationService.getPatientMetadataBySearchKey(searchKey, pageNo, pageSize));
+        return R.ok(iOutpatientRegistrationAppService.getPatientMetadataBySearchKey(searchKey, pageNo, pageSize));
+    }
+
+    /**
+     * 门诊挂号 - 查询机构树
+     *
+     * @param pageNo   当前页码
+     * @param pageSize 查询条数
+     * @return 机构分页列表
+     */
+    @GetMapping(value = "/organization-tree")
+    public R<?> getOrganizationTree(
+            @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return R.ok(iOrganizationAppService.getOrganizationTree(pageNo, pageSize));
     }
 
 

openhis-server/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml

@@ -43,6 +43,8 @@
                     adm_healthcare_service AS T1
                         LEFT JOIN adm_charge_item_definition AS T2 ON T2.instance_id = T1.ID
                         AND T2.instance_table = #{tableName}
+                        AND T1.delete_flag = '0'
+                WHERE T1.delete_flag = '0'
                 ORDER BY
                     T1.create_time DESC
             ) AS T3