-up

openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -32,9 +33,9 @@ public class LocationAppServiceImpl implements ILocationAppService {
     @Override
     public R<?> getLocationTree(Integer formKey, Integer pageNo, Integer pageSize) {
 
-        QueryWrapper<Location> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<Location> queryWrapper = new LambdaQueryWrapper<>();
         if (formKey != null) {
-            queryWrapper.eq("form_enum", formKey);
+            queryWrapper.eq(Location::getFormEnum, formKey);
         }
 
         // 查询位置列表

openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/CabinetLocationController.java

@@ -20,7 +20,7 @@ import lombok.extern.slf4j.Slf4j;
  * @date 2025-02-21
  */
 @RestController
-@RequestMapping("/basedatamanage/cabinet-location")
+@RequestMapping("/base-data-manage/cabinet-location")
 @Slf4j
 @AllArgsConstructor
 public class CabinetLocationController {

openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java

@@ -30,7 +30,7 @@ import lombok.extern.slf4j.Slf4j;
  * @date 2025-02-21
  */
 @RestController
-@RequestMapping("/basedatamanage/organization")
+@RequestMapping("/base-data-manage/organization")
 @Slf4j
 @AllArgsConstructor
 public class OrganizationController {

openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationLocationController.java

@@ -29,7 +29,7 @@ import lombok.extern.slf4j.Slf4j;
  * @date 2025-02-25
  */
 @RestController
-@RequestMapping("/basedatamanage/org-loc")
+@RequestMapping("/base-data-manage/org-loc")
 @Slf4j
 @AllArgsConstructor
 public class OrganizationLocationController {

openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerController.java

@@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j;
  * @date 2025-02-21
  */
 @RestController
-@RequestMapping("/basedatamanage/practitioner")
+@RequestMapping("/base-data-manage/practitioner")
 @Slf4j
 @AllArgsConstructor
 public class PractitionerController {

openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerRoleController.java

@@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j;
  * @date 2025-02-21
  */
 @RestController
-@RequestMapping("/basedatamanage/practitioner-role")
+@RequestMapping("/base-data-manage/practitioner-role")
 @Slf4j
 @AllArgsConstructor
 public class PractitionerRoleController {

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

@@ -46,7 +46,7 @@ import lombok.extern.slf4j.Slf4j;
  * @date 2025-02-20
  */
 @RestController
-@RequestMapping("/datadictionary/device")
+@RequestMapping("/data-dictionary/device")
 @Slf4j
 @AllArgsConstructor
 public class DeviceManageController {

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

@@ -40,7 +40,7 @@ import lombok.extern.slf4j.Slf4j;
  * @date 2025-02-20
  */
 @RestController
-@RequestMapping("/datadictionary/disease")
+@RequestMapping("/data-dictionary/disease")
 @Slf4j
 @AllArgsConstructor
 public class DiseaseManageController {