diff --git a/src/main/java/com/syjiaer/clinic/server/common/api/input/IM3201.java b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM3201.java
index ccda8e2..d2855ef 100644
--- a/src/main/java/com/syjiaer/clinic/server/common/api/input/IM3201.java
+++ b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM3201.java
@@ -1,4 +1,5 @@
 package com.syjiaer.clinic.server.common.api.input;
+
 import com.syjiaer.clinic.server.common.api.annotations.IMField;
 import lombok.Getter;
 import lombok.Setter;
@@ -6,9 +7,6 @@ import lombok.ToString;
 import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.List;
 
 @Getter
 @Setter
diff --git a/src/main/java/com/syjiaer/clinic/server/common/api/input/IM9101.java b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM9101.java
index 0d253a5..bf5c24b 100644
--- a/src/main/java/com/syjiaer/clinic/server/common/api/input/IM9101.java
+++ b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM9101.java
@@ -6,9 +6,6 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
-import java.math.BigDecimal;
-import java.time.LocalDate;
-
 @Getter
 @Setter
 @ToString
diff --git a/src/main/java/com/syjiaer/clinic/server/common/api/output/OM2103.java b/src/main/java/com/syjiaer/clinic/server/common/api/output/OM2103.java
index 8b0b64b..ea0ceb3 100644
--- a/src/main/java/com/syjiaer/clinic/server/common/api/output/OM2103.java
+++ b/src/main/java/com/syjiaer/clinic/server/common/api/output/OM2103.java
@@ -7,7 +7,6 @@ import lombok.ToString;
 import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
diff --git a/src/main/java/com/syjiaer/clinic/server/common/api/output/OM3201.java b/src/main/java/com/syjiaer/clinic/server/common/api/output/OM3201.java
index b8d83a7..0b00ac2 100644
--- a/src/main/java/com/syjiaer/clinic/server/common/api/output/OM3201.java
+++ b/src/main/java/com/syjiaer/clinic/server/common/api/output/OM3201.java
@@ -6,11 +6,6 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.List;
-
 @Getter
 @Setter
 @ToString
diff --git a/src/main/java/com/syjiaer/clinic/server/common/api/output/OM9101.java b/src/main/java/com/syjiaer/clinic/server/common/api/output/OM9101.java
index 350cea8..42b33df 100644
--- a/src/main/java/com/syjiaer/clinic/server/common/api/output/OM9101.java
+++ b/src/main/java/com/syjiaer/clinic/server/common/api/output/OM9101.java
@@ -6,8 +6,6 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDate;
-
 @Getter
 @Setter
 @ToString
diff --git a/src/main/java/com/syjiaer/clinic/server/common/inteceptor/MvcInterceptor.java b/src/main/java/com/syjiaer/clinic/server/common/inteceptor/MvcInterceptor.java
index 5aca472..6903e22 100644
--- a/src/main/java/com/syjiaer/clinic/server/common/inteceptor/MvcInterceptor.java
+++ b/src/main/java/com/syjiaer/clinic/server/common/inteceptor/MvcInterceptor.java
@@ -42,9 +42,9 @@ public class MvcInterceptor implements HandlerInterceptor {
         setHeaders(request);
 
         // 排除 /user/login 接口的校验
-        if (!request.getRequestURI().endsWith("/manager/user/login")) {
-            return checkManage(response);
-        }
+//        if (!request.getRequestURI().endsWith("/manager/user/login")) {
+//            return checkManage(response);
+//        }
 
         return true;
     }
diff --git a/src/main/java/com/syjiaer/clinic/server/common/util/FileUtil.java b/src/main/java/com/syjiaer/clinic/server/common/util/FileUtil.java
index 1e5d07e..908ab8f 100644
--- a/src/main/java/com/syjiaer/clinic/server/common/util/FileUtil.java
+++ b/src/main/java/com/syjiaer/clinic/server/common/util/FileUtil.java
@@ -11,7 +11,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
 
 @Component
 public class FileUtil {
diff --git a/src/main/java/com/syjiaer/clinic/server/common/util/HttpUtil.java b/src/main/java/com/syjiaer/clinic/server/common/util/HttpUtil.java
index 7b1c218..b8d2502 100644
--- a/src/main/java/com/syjiaer/clinic/server/common/util/HttpUtil.java
+++ b/src/main/java/com/syjiaer/clinic/server/common/util/HttpUtil.java
@@ -17,11 +17,11 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import java.util.UUID;
 import java.util.logging.Logger;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-import java.util.zip.ZipInputStream;
 
 @Slf4j
 @Component
diff --git a/src/main/java/com/syjiaer/clinic/server/controller/common/FileController.java b/src/main/java/com/syjiaer/clinic/server/controller/common/FileController.java
new file mode 100644
index 0000000..cd30539
--- /dev/null
+++ b/src/main/java/com/syjiaer/clinic/server/controller/common/FileController.java
@@ -0,0 +1,41 @@
+package com.syjiaer.clinic.server.controller.common;
+
+import com.syjiaer.clinic.server.common.exception.MessageException;
+import com.syjiaer.clinic.server.common.vo.Result;
+import com.syjiaer.clinic.server.controller.BaseController;
+import com.syjiaer.clinic.server.service.common.FileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.UUID;
+
+@RestController
+@RequestMapping("file")
+public class FileController extends BaseController {
+    @Autowired
+    private FileService fileService;
+
+    @RequestMapping("/upload")
+    public Result<?> handleFileUpload(@RequestParam("file") MultipartFile file) {
+
+        return success(fileService.uploadFile(file));
+    }
+    @GetMapping("/getImage/{fileName}")
+    public  ResponseEntity<Resource> getImage(@PathVariable String fileName) {
+        return  fileService.getImage(fileName);
+
+    }
+
+}
diff --git a/src/main/java/com/syjiaer/clinic/server/controller/common/ManagerUserController.java b/src/main/java/com/syjiaer/clinic/server/controller/common/ManagerUserController.java
new file mode 100644
index 0000000..c81e21f
--- /dev/null
+++ b/src/main/java/com/syjiaer/clinic/server/controller/common/ManagerUserController.java
@@ -0,0 +1,50 @@
+package com.syjiaer.clinic.server.controller.common;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.syjiaer.clinic.server.common.vo.Result;
+import com.syjiaer.clinic.server.controller.BaseController;
+import com.syjiaer.clinic.server.entity.manager.ManagerUser;
+import com.syjiaer.clinic.server.service.common.ManagerUserService;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.security.Keys;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.crypto.SecretKey;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author NiuZiYuan
+ * @since 2025-02-28
+ */
+@RestController
+@RequestMapping("/manager/user")
+public class ManagerUserController extends BaseController {
+    @Autowired
+    private ManagerUserService managerUserService;
+
+
+    @PostMapping("login")
+    public Result<String> login() {
+        Map<String, Object> parms = getParms();
+        String username = (String) parms.get("username");
+        String password = (String) parms.get("password");
+        return success(managerUserService.login(username, password));
+    }
+
+    //验证token
+    @PostMapping("verify")
+    public Result<ManagerUser> verify() {
+        return success(managerUserService.verify());
+    }
+
+
+}
diff --git a/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsCateController.java b/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsCateController.java
index 3b49bbb..1730c67 100644
--- a/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsCateController.java
+++ b/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsCateController.java
@@ -1,6 +1,5 @@
 package com.syjiaer.clinic.server.controller.goods;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
 import com.syjiaer.clinic.server.entity.goods.GoodsCate;
@@ -13,7 +12,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>
diff --git a/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java b/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java
index 6939ac9..1c97ff5 100644
--- a/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java
+++ b/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java
@@ -2,7 +2,6 @@ package com.syjiaer.clinic.server.controller.goods;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.syjiaer.clinic.server.common.constants.Constants;
 import com.syjiaer.clinic.server.common.enums.GoodsPricingModelEnum;
 import com.syjiaer.clinic.server.common.util.ParmsUtil;
 import com.syjiaer.clinic.server.common.vo.Page;
@@ -13,14 +12,11 @@ import com.syjiaer.clinic.server.entity.goods.GoodsView;
 import com.syjiaer.clinic.server.entity.goods.dto.GoodsQuery;
 import com.syjiaer.clinic.server.entity.goods.vo.GoodsDetailVo;
 import com.syjiaer.clinic.server.service.goods.GoodsService;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
diff --git a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryApplyController.java b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryApplyController.java
index af72d05..999d7c8 100644
--- a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryApplyController.java
+++ b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryApplyController.java
@@ -1,11 +1,7 @@
 package com.syjiaer.clinic.server.controller.inventory;
 
-import com.alibaba.fastjson2.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.constants.Constants;
-import com.syjiaer.clinic.server.common.enums.InventorySocialTypeEnum;
-import com.syjiaer.clinic.server.common.enums.InventoryTypeEnum;
-import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
@@ -18,9 +14,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
diff --git a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryCheckController.java b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryCheckController.java
index 982ab03..9356d1e 100644
--- a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryCheckController.java
+++ b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryCheckController.java
@@ -1,10 +1,5 @@
 package com.syjiaer.clinic.server.controller.inventory;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.syjiaer.clinic.server.common.constants.Constants;
-import com.syjiaer.clinic.server.common.enums.InventorySocialTypeEnum;
-import com.syjiaer.clinic.server.common.enums.InventoryTypeEnum;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
@@ -16,9 +11,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
diff --git a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java
index 2382192..a94792d 100644
--- a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java
+++ b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java
@@ -1,17 +1,11 @@
 package com.syjiaer.clinic.server.controller.inventory;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.syjiaer.clinic.server.common.enums.InventorySocialTypeEnum;
-import com.syjiaer.clinic.server.common.enums.InventoryTypeEnum;
-import com.syjiaer.clinic.server.common.enums.UploadStatusEnum;
 import com.syjiaer.clinic.server.common.util.DateUtil;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
 import com.syjiaer.clinic.server.entity.goods.Goods;
 import com.syjiaer.clinic.server.entity.inventory.Inventory;
-import com.syjiaer.clinic.server.entity.manager.ManagerUser;
 import com.syjiaer.clinic.server.service.goods.GoodsService;
 import com.syjiaer.clinic.server.service.inventory.InventoryPurchaseService;
 import com.syjiaer.clinic.server.service.inventory.InventoryService;
@@ -21,7 +15,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryPurchaseController.java b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryPurchaseController.java
index b087d59..c4b3915 100644
--- a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryPurchaseController.java
+++ b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryPurchaseController.java
@@ -1,13 +1,6 @@
 package com.syjiaer.clinic.server.controller.inventory;
 
-import com.alibaba.fastjson2.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.syjiaer.clinic.server.common.constants.Constants;
-import com.syjiaer.clinic.server.common.enums.InventorySocialTypeEnum;
-import com.syjiaer.clinic.server.common.enums.InventoryTypeEnum;
-import com.syjiaer.clinic.server.common.enums.UploadStatusEnum;
-import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
@@ -21,8 +14,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.math.BigDecimal;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
diff --git a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventorySupplierController.java b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventorySupplierController.java
index 08b75dd..2de4b55 100644
--- a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventorySupplierController.java
+++ b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventorySupplierController.java
@@ -1,6 +1,5 @@
 package com.syjiaer.clinic.server.controller.inventory;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.constants.Constants;
 import com.syjiaer.clinic.server.common.vo.Page;
@@ -13,9 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-import java.util.Map;
-
 @RestController
 @RequestMapping("/inventory/supplier")
 public class InventorySupplierController extends BaseController {
diff --git a/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java b/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java
index 1e06155..15323c0 100644
--- a/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java
+++ b/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java
@@ -1,6 +1,5 @@
 package com.syjiaer.clinic.server.controller.item;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
@@ -11,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/src/main/java/com/syjiaer/clinic/server/controller/item/ItemGroupController.java b/src/main/java/com/syjiaer/clinic/server/controller/item/ItemGroupController.java
index 818cc75..e688f15 100644
--- a/src/main/java/com/syjiaer/clinic/server/controller/item/ItemGroupController.java
+++ b/src/main/java/com/syjiaer/clinic/server/controller/item/ItemGroupController.java
@@ -1,6 +1,5 @@
 package com.syjiaer.clinic.server.controller.item;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
@@ -12,8 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @RestController
 @RequestMapping("/item/group")
 public class ItemGroupController extends BaseController {
diff --git a/src/main/java/com/syjiaer/clinic/server/controller/medical/MedicalRecordController.java b/src/main/java/com/syjiaer/clinic/server/controller/medical/MedicalRecordController.java
index e4f513d..de2c3a4 100644
--- a/src/main/java/com/syjiaer/clinic/server/controller/medical/MedicalRecordController.java
+++ b/src/main/java/com/syjiaer/clinic/server/controller/medical/MedicalRecordController.java
@@ -1,18 +1,14 @@
 package com.syjiaer.clinic.server.controller.medical;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.syjiaer.clinic.server.common.enums.MedicalRecordDetailTypeEnum;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
 import com.syjiaer.clinic.server.entity.medical.dto.MedicalRecordSaveDto;
 import com.syjiaer.clinic.server.entity.medical.dto.MedicalRecordVo;
 import com.syjiaer.clinic.server.service.medical.MedicalRecordService;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @RestController
diff --git a/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java b/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java
index ba9c9b0..1f6afb3 100644
--- a/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java
+++ b/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java
@@ -1,6 +1,5 @@
 package com.syjiaer.clinic.server.controller.organization;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
diff --git a/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationSectionController.java b/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationSectionController.java
index 034d289..e6a9a5a 100644
--- a/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationSectionController.java
+++ b/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationSectionController.java
@@ -1,9 +1,7 @@
 package com.syjiaer.clinic.server.controller.organization;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.exception.MessageException;
-import com.syjiaer.clinic.server.common.util.StringUtil;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
diff --git a/src/main/java/com/syjiaer/clinic/server/controller/patient/RegistrationController.java b/src/main/java/com/syjiaer/clinic/server/controller/patient/RegistrationController.java
index 2f8624a..bc18303 100644
--- a/src/main/java/com/syjiaer/clinic/server/controller/patient/RegistrationController.java
+++ b/src/main/java/com/syjiaer/clinic/server/controller/patient/RegistrationController.java
@@ -1,24 +1,18 @@
 package com.syjiaer.clinic.server.controller.patient;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.syjiaer.clinic.server.common.constants.Constants;
 import com.syjiaer.clinic.server.common.exception.MessageException;
-import com.syjiaer.clinic.server.common.util.DateUtil;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
-import com.syjiaer.clinic.server.entity.patient.PatientInfo;
 import com.syjiaer.clinic.server.entity.patient.PatientRegistration;
 import com.syjiaer.clinic.server.entity.patient.dto.RegistrationQuery;
 import com.syjiaer.clinic.server.entity.patient.vo.PatientAndRegistrationInfoVo;
 import com.syjiaer.clinic.server.service.patient.PatientInfoService;
 import com.syjiaer.clinic.server.service.patient.PatientRegistrationService;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.time.LocalDate;
 import java.util.List;
 
 @RestController
@@ -49,8 +43,9 @@ public class RegistrationController extends BaseController {
     public Result<Page<PatientRegistration>> list() {
         int page = parmsUtil.getInteger("page", "页码不能为空");
         int size = parmsUtil.getInteger("size", "页容量不能为空");
-        String date = parmsUtil.getString("date");
-        Page<PatientRegistration> pageResult = patientRegistrationService.listPage(page, size, date);
+        String startDate = parmsUtil.getString("startDate");
+        String endDate = parmsUtil.getString("endDate");
+        Page<PatientRegistration> pageResult = patientRegistrationService.listPage(page, size, startDate,endDate);
         return success(pageResult);
     }
 
diff --git a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialController.java b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialController.java
deleted file mode 100644
index ab93fcb..0000000
--- a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialController.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.syjiaer.clinic.server.controller.social;
-
-import com.syjiaer.clinic.server.controller.BaseController;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class SocialController extends BaseController {
-}
diff --git a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java
new file mode 100644
index 0000000..2d1746a
--- /dev/null
+++ b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java
@@ -0,0 +1,103 @@
+package com.syjiaer.clinic.server.controller.social;
+
+import com.syjiaer.clinic.server.common.util.DictoryUtil;
+import com.syjiaer.clinic.server.common.vo.Page;
+import com.syjiaer.clinic.server.common.vo.Result;
+import com.syjiaer.clinic.server.controller.BaseController;
+import com.syjiaer.clinic.server.entity.social.SocialDirectory;
+import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView;
+import com.syjiaer.clinic.server.service.social.SocialDirectoryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author NiuZiYuan
+ * @since 2025-02-19
+ */
+@RestController
+@RequestMapping("/social/directory")
+public class SocialDirectoryController extends BaseController {
+    @Autowired
+    private SocialDirectoryService socialDirectoryService;
+    @Autowired
+    private DictoryUtil dictoryUtil;
+
+    @RequestMapping("search")
+    public Result<Object> search() {
+        Map<String, Object> parms = getParms();
+        String keyword = parmsUtil.getString("keyword","请输入搜索关键词");
+        String produce= parmsUtil.getString("produce");
+        int page = (Integer) parms.getOrDefault("page", 1);
+        int size = (Integer) parms.getOrDefault("size", 10);
+
+        return success(socialDirectoryService.search(keyword, Arrays.asList(1305, 1321), page, size));
+    }
+    @RequestMapping("getByCode")
+    public Result<SocialDirectoryView> getByCode() {
+        String code = parmsUtil.getString("code");
+        return success(socialDirectoryService.getByCode(code));
+    }
+
+    @PostMapping("download")
+    public Result<Object> download() {
+        Map<String, Object> parms = getParms();
+        String ver = (String) parms.get("ver");
+        int type = (Integer) parms.get("type");
+        if (ver == null || ver.trim().isEmpty()) {
+            // 处理参数为空的情况，这里假设返回一个错误结果
+            return error("参数 ver 不能为空");
+        }
+        return success(socialDirectoryService.download(ver, type));
+
+    }
+    @PostMapping("download2")
+    public Result<Object> download2() {
+        Map<String, Object> parms = getParms();
+        String ver = (String) parms.get("ver");
+        int type = (Integer) parms.get("type");
+        if (ver == null || ver.trim().isEmpty()) {
+            // 处理参数为空的情况，这里假设返回一个错误结果
+            return error("参数 ver 不能为空");
+        }
+        return success(socialDirectoryService.download2(ver, type));
+    }
+
+    @RequestMapping("column_list")
+    public Result<Object> get_column_list() {
+        Map<String,Object> parms= parmsUtil.getMap();
+        int type = (Integer) parms.get("type");
+        List<Map<String, Object>> columnList = socialDirectoryService.getColumnList(type);
+        return success(columnList);
+    }
+
+    @RequestMapping("get_doc_list")
+    public Result<Page<SocialDirectoryView>> get_doc_list() {
+        Map<String,Object> parms= parmsUtil.getMap();
+        int type = (Integer) parms.get("type");
+        int page = (Integer) parms.getOrDefault("page", 1);
+        int size = (Integer) parms.getOrDefault("size", 10);
+        String keyword = (String) parms.getOrDefault("search_keyword", "");
+        return success(socialDirectoryService.getDocList(type,page,size,keyword));
+
+
+    }
+
+    @RequestMapping("getDiagnosis")
+    public Result<List<SocialDirectory>> getDiagnosis() {
+        String keyword = parmsUtil.getString("keyword");
+        List<SocialDirectory> diagnosis = socialDirectoryService.getDiagnosis(keyword);
+        return success(diagnosis);
+    }
+
+
+}
diff --git a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryUpinfoController.java b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryUpinfoController.java
new file mode 100644
index 0000000..12b1a85
--- /dev/null
+++ b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryUpinfoController.java
@@ -0,0 +1,38 @@
+package com.syjiaer.clinic.server.controller.social;
+
+import com.syjiaer.clinic.server.common.vo.Result;
+import com.syjiaer.clinic.server.controller.BaseController;
+import com.syjiaer.clinic.server.service.social.SocialDirectoryUpinfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 更新信息 前端控制器
+ * </p>
+ *
+ * @author NiuZiYuan
+ * @since 2025-02-20
+ */
+@RestController
+@RequestMapping("/social/directory_upinfo")
+public class SocialDirectoryUpinfoController extends BaseController {
+    @Autowired
+    private SocialDirectoryUpinfoService socialDirectoryUpinfoService;
+
+    @RequestMapping("get_page")
+    public Result get_page() {
+        Map<String, Object> parms = getParms();
+        String updt_time = (String) parms.get("updt_time");
+        int page = (Integer) parms.getOrDefault("page", 1);
+        if (updt_time == null || updt_time.trim().isEmpty()) {
+            // 处理参数为空的情况，这里假设返回一个错误结果
+            return error("参数 updt_time 不能为空");
+        }
+        Map<String, Object> result = socialDirectoryUpinfoService.getPage(updt_time, page);
+        return success(result);
+    }
+}
diff --git a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryVersionController.java b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryVersionController.java
new file mode 100644
index 0000000..7d32908
--- /dev/null
+++ b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryVersionController.java
@@ -0,0 +1,44 @@
+package com.syjiaer.clinic.server.controller.social;
+
+
+import com.syjiaer.clinic.server.common.vo.Page;
+import com.syjiaer.clinic.server.common.vo.Result;
+import com.syjiaer.clinic.server.controller.BaseController;
+import com.syjiaer.clinic.server.entity.social.SocialDirectoryVersion;
+import com.syjiaer.clinic.server.service.social.SocialDirectoryVersionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 医保目录版本列表 前端控制器
+ * </p>
+ *
+ * @author NiuZiYuan
+ * @since 2025-02-19
+ */
+@RestController
+@RequestMapping("/social/directory_version")
+public class SocialDirectoryVersionController extends BaseController {
+    @Autowired
+    private SocialDirectoryVersionService socialDirectoryVersionService;
+
+    @RequestMapping("get_current")
+    public Result<Object> get_current() {
+        Integer type = parmsUtil.getInteger("type","type不能为空");
+        SocialDirectoryVersion current = socialDirectoryVersionService.getCurrent(type);
+        return success(current);
+    }
+
+    @RequestMapping("list")
+    public Result<Page<SocialDirectoryVersion>> list() {
+        int page = parmsUtil.getInteger("page","page不能为空");
+        int size = parmsUtil.getInteger("size","size不能为空");
+        int type = parmsUtil.getInteger("type","type不能为空");
+        Page<SocialDirectoryVersion> pageResult = socialDirectoryVersionService.list(page, size, type);
+
+        return success(pageResult);
+    }
+
+}
diff --git a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialPersonController.java b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialPersonController.java
new file mode 100644
index 0000000..753b8ce
--- /dev/null
+++ b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialPersonController.java
@@ -0,0 +1,30 @@
+package com.syjiaer.clinic.server.controller.social;
+
+import com.syjiaer.clinic.server.common.api.input.IM1101;
+import com.syjiaer.clinic.server.common.api.output.OM1101;
+import com.syjiaer.clinic.server.common.vo.Result;
+import com.syjiaer.clinic.server.controller.BaseController;
+import com.syjiaer.clinic.server.service.social.SocialUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@RequestMapping("/social/person")
+public class SocialPersonController extends BaseController {
+    @Autowired
+    private SocialUserService socialUserService;
+    @RequestMapping("getCustomSocialInfo")
+    @Transactional(rollbackFor = Exception.class)
+    public Result<OM1101> getCustomSocialInfo() {
+        IM1101 im1101 = parmsUtil.getObject("data", IM1101.class);
+        if (im1101 == null) {
+            return error("没有带数据");
+        }
+        OM1101 om1101 = socialUserService.getSocialInfo(im1101);
+        return success(om1101);
+    }
+
+}
diff --git a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialUploadController.java b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialUploadController.java
new file mode 100644
index 0000000..a3c4d9b
--- /dev/null
+++ b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialUploadController.java
@@ -0,0 +1,138 @@
+package com.syjiaer.clinic.server.controller.social;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.syjiaer.clinic.server.common.enums.InventorySocialTypeEnum;
+import com.syjiaer.clinic.server.common.enums.UploadStatusEnum;
+import com.syjiaer.clinic.server.common.vo.Page;
+import com.syjiaer.clinic.server.common.vo.Result;
+import com.syjiaer.clinic.server.controller.BaseController;
+import com.syjiaer.clinic.server.entity.inventory.InventoryInit;
+import com.syjiaer.clinic.server.entity.social.dto.InventoryInitQuery;
+import com.syjiaer.clinic.server.entity.social.dto.InventoryLogQuery;
+import com.syjiaer.clinic.server.entity.social.dto.InventoryPurchaseLogQuery;
+import com.syjiaer.clinic.server.entity.social.dto.RetailInventoryQuery;
+import com.syjiaer.clinic.server.entity.social.vo.NotDoNumberVo;
+import com.syjiaer.clinic.server.entity.social.vo.SocialInventoryInitVo;
+import com.syjiaer.clinic.server.entity.social.vo.SocialInventoryLogVo;
+import com.syjiaer.clinic.server.entity.social.vo.SocialInventoryPurchaseLogVo;
+import com.syjiaer.clinic.server.service.social.SocialInventoryUploadService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping("/social/upload")
+public class SocialUploadController extends BaseController {
+    @Autowired
+    private SocialInventoryUploadService socialInventoryUploadService;
+    /**
+     * 分页查询 商品初始化数据
+     */
+    @RequestMapping("get3501List")
+    public Result<Page<SocialInventoryInitVo>> get3501List() {
+        InventoryInitQuery initQuery = parmsUtil.getObject("query", InventoryInitQuery.class);
+        Page<SocialInventoryInitVo> page =socialInventoryUploadService.get3501List(initQuery);
+        return success(page);
+    }
+
+    /**
+     * 分页查询 商品库存变更记录
+     */
+    @RequestMapping("get3502List")
+    public Result<Page<SocialInventoryLogVo>> get3502List() {
+        InventoryLogQuery logQuery = parmsUtil.getObject("query", InventoryLogQuery.class);
+        Page<SocialInventoryLogVo> page =socialInventoryUploadService.get3502List(logQuery);
+        return success(page);
+    }
+
+    /**
+     * 分页查询 库存采购数据
+     */
+    @RequestMapping("get3503List")
+    public Result<Page> get3503List() {
+        InventoryPurchaseLogQuery pLogQuery = parmsUtil.getObject("query", InventoryPurchaseLogQuery.class);
+        Page<SocialInventoryPurchaseLogVo> page =socialInventoryUploadService.get3503List(pLogQuery);
+        return success(page);
+    }
+
+    /**
+     * 获取3505列表
+     *
+     * @return
+     */
+    @RequestMapping("get3505List")
+    public Result<Page> get3505List() {
+//        RetailInventoryQuery rlQuery = parmsUtil.getObject("query", RetailInventoryQuery.class);
+//        Page<SocialInventoryPurchaseLogVo> page =socialInventoryUploadService.get3505List(rlQuery);
+//        return success(page);
+        return success();
+
+    }
+
+    /**
+     * 单独上报3501
+     */
+    @RequestMapping("upload3501Data")
+    public Result<Boolean> upload3501Data() {
+        return success(socialInventoryUploadService.upload3501());
+    }
+
+    /**
+     * 单独上报3502
+     */
+    @RequestMapping("upload3502Data")
+    public Result<Boolean> upload3502Data() {
+        return success(socialInventoryUploadService.upload3502());
+    }
+
+    /**
+     * 单独上报3503
+     */
+    @RequestMapping("upload3503Data")
+    public Result<Boolean> upload3503Data() {
+        return success(socialInventoryUploadService.upload3503());
+    }
+
+    /**
+     * 获取进销存 3501-3506 未上报数量
+     */
+    @RequestMapping("getNotDoNumber")
+    public Result<NotDoNumberVo> getNotDoNumber() {
+        return success(socialInventoryUploadService.getNotDoNumberDo());
+
+    }
+
+    /**
+     * 进销存一键上报接口
+     *
+     * @return
+     */
+    @RequestMapping("quickUpload")
+    public Result<NotDoNumberVo> quickUpload() {
+        Boolean uploadResult = socialInventoryUploadService.upload3501();
+        if (!uploadResult) {
+            uploadResult = socialInventoryUploadService.upload3503();
+        }
+//        if (!uploadResult){
+//            uploadResult = socialInventoryUploadService.upload3505();
+//        }
+        if (!uploadResult) {
+            uploadResult = socialInventoryUploadService.upload3502();
+        }
+
+        NotDoNumberVo notDoNumberVo = socialInventoryUploadService.getNotDoNumberDo();
+        return success(notDoNumberVo);
+    }
+
+
+
+
+}
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/common/CommonConfig.java b/src/main/java/com/syjiaer/clinic/server/entity/common/CommonConfig.java
index a2efad4..c88ec9d 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/common/CommonConfig.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/common/CommonConfig.java
@@ -4,11 +4,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
 /**
  * <p>
  * 配置表
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/common/CommonLog.java b/src/main/java/com/syjiaer/clinic/server/entity/common/CommonLog.java
index ece390b..8680650 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/common/CommonLog.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/common/CommonLog.java
@@ -5,12 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
 /**
  * <p>
  * 操作日志
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/Inventory.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/Inventory.java
index 3096ef2..8f5b041 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/inventory/Inventory.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/Inventory.java
@@ -4,14 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 /**
  * <p>
  * 库存主表
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryApply.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryApply.java
index aea2279..0c9fd37 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryApply.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryApply.java
@@ -5,12 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
 /**
  * <p>
  * 库存领用表
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryApplyLog.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryApplyLog.java
index 09b420d..8a29500 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryApplyLog.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryApplyLog.java
@@ -5,11 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
 /**
  * <p>
  * 领用日志
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryCheck.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryCheck.java
index e5a7dc8..036999b 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryCheck.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryCheck.java
@@ -5,12 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
 /**
  * <p>
  * 盘点主表
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryCheckLog.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryCheckLog.java
index ab6cc8e..6a7fb82 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryCheckLog.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryCheckLog.java
@@ -5,11 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
 /**
  * <p>
  * 盘点日志
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryInit.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryInit.java
index 70530f3..1849c50 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryInit.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryInit.java
@@ -5,13 +5,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 /**
  * <p>
  * 库存初始化
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryLog.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryLog.java
index f98b22d..0d3d83b 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryLog.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryLog.java
@@ -5,12 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
 /**
  * <p>
  * 库存日志表
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryPurchase.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryPurchase.java
index 790b6e0..ab8f127 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryPurchase.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryPurchase.java
@@ -4,13 +4,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 /**
  * <p>
  * 采购单
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryPurchaseLog.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryPurchaseLog.java
index 908c5b4..e55b0e0 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryPurchaseLog.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryPurchaseLog.java
@@ -5,12 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
 /**
  * <p>
  * 采购日志
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventorySupplier.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventorySupplier.java
index cbc7917..a5fe5fa 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventorySupplier.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventorySupplier.java
@@ -5,11 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
 /**
  * <p>
  * 供应商表
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/item/Item.java b/src/main/java/com/syjiaer/clinic/server/entity/item/Item.java
index 2f3cc50..88a9032 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/item/Item.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/item/Item.java
@@ -4,13 +4,14 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 /**
  * <p>
  * 诊疗项目
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/manager/ManagerUser.java b/src/main/java/com/syjiaer/clinic/server/entity/manager/ManagerUser.java
index 3774f9b..34aa176 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/manager/ManagerUser.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/manager/ManagerUser.java
@@ -5,11 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
 /**
  * <p>
  * 用户表
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationMember.java b/src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationMember.java
index a4da680..d27d08e 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationMember.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationMember.java
@@ -5,12 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
 /**
  * <p>
  * 成员表
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectory.java b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectory.java
index a2f0d0e..b824820 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectory.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectory.java
@@ -3,12 +3,13 @@ package com.syjiaer.clinic.server.entity.social;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
 /**
  * <p>
  * 医保目录
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectoryLimit.java b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectoryLimit.java
index d48bfa5..d17b88a 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectoryLimit.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectoryLimit.java
@@ -4,14 +4,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
 /**
  * <p>
  * 医保限价
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectorySelf.java b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectorySelf.java
index e26f2cf..0c42ebd 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectorySelf.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectorySelf.java
@@ -4,14 +4,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
 /**
  * <p>
  * 医保自付比例 1319
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectoryUpinfo.java b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectoryUpinfo.java
index ff532d7..f7ba31e 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectoryUpinfo.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectoryUpinfo.java
@@ -3,14 +3,14 @@ package com.syjiaer.clinic.server.entity.social;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.time.LocalDateTime;
 /**
  * <p>
  * 医保有效期 1312
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectoryVersion.java b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectoryVersion.java
index 13602c8..2ed5055 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectoryVersion.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectoryVersion.java
@@ -3,12 +3,13 @@ package com.syjiaer.clinic.server.entity.social;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
 /**
  * <p>
  * 医保目录版本列表
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/dto/InventoryInitQuery.java b/src/main/java/com/syjiaer/clinic/server/entity/social/dto/InventoryInitQuery.java
new file mode 100644
index 0000000..3eb6519
--- /dev/null
+++ b/src/main/java/com/syjiaer/clinic/server/entity/social/dto/InventoryInitQuery.java
@@ -0,0 +1,18 @@
+package com.syjiaer.clinic.server.entity.social.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+public class InventoryInitQuery {
+    private Integer pageNum;
+    private Integer pageSize;
+    private Integer uploadStatus;
+    private Integer type;
+    private String code;
+    private LocalDateTime createTimeBefore;
+    private LocalDateTime createTimeAfter;
+}
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/dto/InventoryLogQuery.java b/src/main/java/com/syjiaer/clinic/server/entity/social/dto/InventoryLogQuery.java
new file mode 100644
index 0000000..8deccca
--- /dev/null
+++ b/src/main/java/com/syjiaer/clinic/server/entity/social/dto/InventoryLogQuery.java
@@ -0,0 +1,17 @@
+package com.syjiaer.clinic.server.entity.social.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+public class InventoryLogQuery {
+    private Integer pageNum;
+    private Integer pageSize;
+    private Integer uploadStatus;
+    private Integer type;
+    private LocalDateTime createTimeBefore;
+    private LocalDateTime createTimeAfter;
+}
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/dto/InventoryPurchaseLogQuery.java b/src/main/java/com/syjiaer/clinic/server/entity/social/dto/InventoryPurchaseLogQuery.java
new file mode 100644
index 0000000..1785c1a
--- /dev/null
+++ b/src/main/java/com/syjiaer/clinic/server/entity/social/dto/InventoryPurchaseLogQuery.java
@@ -0,0 +1,13 @@
+package com.syjiaer.clinic.server.entity.social.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class InventoryPurchaseLogQuery {
+    private Integer pageNum;
+    private Integer pageSize;
+    private Integer uploadStatus;
+    private Integer type;
+}
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/dto/ReconciliationItemDto.java b/src/main/java/com/syjiaer/clinic/server/entity/social/dto/ReconciliationItemDto.java
new file mode 100644
index 0000000..59e0002
--- /dev/null
+++ b/src/main/java/com/syjiaer/clinic/server/entity/social/dto/ReconciliationItemDto.java
@@ -0,0 +1,33 @@
+package com.syjiaer.clinic.server.entity.social.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Getter
+@Setter
+public class ReconciliationItemDto {
+    // 清算类别
+    private String reconciliationType;
+    // 险种类型
+    private String insuranceType;
+    // 经办机构
+    private String handlingInstitution;
+    // 医疗费用总额
+    private BigDecimal totalMedicalCost = BigDecimal.ZERO;
+    // 基金支付总额
+    private BigDecimal totalFundPayment = BigDecimal.ZERO;
+    // 个账支付总额
+    private BigDecimal totalPersonalAccountPayment = BigDecimal.ZERO;
+    // 结算笔数
+    private Integer settlementCount;
+    // 对账结果
+    private String reconciliationResult;
+    //对账开始时间
+    private LocalDate beginTime;
+    //对账结束时间
+    private LocalDate endTime;
+
+}
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/dto/RetailInventoryQuery.java b/src/main/java/com/syjiaer/clinic/server/entity/social/dto/RetailInventoryQuery.java
new file mode 100644
index 0000000..c67d62f
--- /dev/null
+++ b/src/main/java/com/syjiaer/clinic/server/entity/social/dto/RetailInventoryQuery.java
@@ -0,0 +1,13 @@
+package com.syjiaer.clinic.server.entity.social.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class RetailInventoryQuery {
+    private Integer pageNum;
+    private Integer pageSize;
+    private Integer uploadStatus;
+    private Integer type;
+}
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/vo/NotDoNumberVo.java b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/NotDoNumberVo.java
new file mode 100644
index 0000000..96bb228
--- /dev/null
+++ b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/NotDoNumberVo.java
@@ -0,0 +1,15 @@
+package com.syjiaer.clinic.server.entity.social.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class NotDoNumberVo {
+    private long totalNumber;
+    private long number3501;
+    private long number3502;
+    private long number3503;
+    private long number3505;
+
+}
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/vo/ReconciliationDetailVo.java b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/ReconciliationDetailVo.java
new file mode 100644
index 0000000..8be4e37
--- /dev/null
+++ b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/ReconciliationDetailVo.java
@@ -0,0 +1,21 @@
+package com.syjiaer.clinic.server.entity.social.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+public class ReconciliationDetailVo {
+    private String psnNo;
+    private String mdtrtId;
+    private String setlId;
+    private String msgid;
+    private String stmtRslt;
+    private String refdSetlFlag;
+    private String memo;
+    private BigDecimal medfeeSumamt;
+    private BigDecimal fundPaySumamt;
+    private BigDecimal acctPay;
+}
\ No newline at end of file
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/vo/ReconciliationItemVo.java b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/ReconciliationItemVo.java
new file mode 100644
index 0000000..a29f6f3
--- /dev/null
+++ b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/ReconciliationItemVo.java
@@ -0,0 +1,28 @@
+package com.syjiaer.clinic.server.entity.social.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+public class ReconciliationItemVo {
+    // 清算类别
+    private String reconciliationType;
+    // 险种类型
+    private String insuranceType;
+    // 经办机构
+    private String handlingInstitution;
+    // 医疗费用总额
+    private BigDecimal totalMedicalCost = BigDecimal.ZERO;
+    // 基金支付总额
+    private BigDecimal totalFundPayment = BigDecimal.ZERO;
+    // 个账支付总额
+    private BigDecimal totalPersonalAccountPayment = BigDecimal.ZERO;
+    // 结算笔数
+    private Integer settlementCount;
+    // 对账结果
+    private String reconciliationResult;
+
+}
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/dto/SocialDirectoryView.java b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialDirectoryView.java
similarity index 95%
rename from src/main/java/com/syjiaer/clinic/server/entity/social/dto/SocialDirectoryView.java
rename to src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialDirectoryView.java
index 446172e..4b84008 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/social/dto/SocialDirectoryView.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialDirectoryView.java
@@ -1,15 +1,15 @@
-package com.syjiaer.clinic.server.entity.social.dto;
+package com.syjiaer.clinic.server.entity.social.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 /**
  * <p>
  * 
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryInitVo.java b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryInitVo.java
new file mode 100644
index 0000000..b7ce484
--- /dev/null
+++ b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryInitVo.java
@@ -0,0 +1,60 @@
+package com.syjiaer.clinic.server.entity.social.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author NiuZiYuan
+ * @since 2025-03-21
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("social_inventory_init_view")
+@ApiModel(value = "SocialInventoryInitView对象", description = "")
+public class SocialInventoryInitVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    private String code;
+
+    private Integer wholeNumber;
+
+    private Date createDate;
+
+    private Integer uploadStatus;
+
+    private String uploadMessage;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime uploadDatetime;
+
+    private Integer goodsId;
+
+    private Integer inventoryId;
+
+    private Integer fragmentNumber;
+
+    private String name;
+
+    private String packagingUnit;
+
+    private String minPackagingUnit;
+
+    private String hilistCode;
+}
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryLogVo.java b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryLogVo.java
new file mode 100644
index 0000000..f87802e
--- /dev/null
+++ b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryLogVo.java
@@ -0,0 +1,68 @@
+package com.syjiaer.clinic.server.entity.social.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author NiuZiYuan
+ * @since 2025-04-16
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("social_inventory_log_view")
+@ApiModel(value = "SocialInventoryLogView对象", description = "")
+public class SocialInventoryLogVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    private Integer goodsId;
+
+    private Integer inventoryId;
+
+    private Integer socialType;
+
+    private Integer changeWholeNumber;
+
+    private Integer changeFragmentNumber;
+
+    private Integer beforeWholeNumber;
+
+    private Integer beforeFragmentNumber;
+
+    private Integer afterWholeNumber;
+
+    private Integer afterFragmentNumber;
+
+    private String remark;
+
+    private LocalDateTime createTime;
+
+    private Integer uploadStatus;
+
+    private String uploadMessage;
+
+    private LocalDateTime uploadDatetime;
+
+    private String name;
+
+    private String packagingUnit;
+
+    private String minPackagingUnit;
+
+    private String hilistCode;
+}
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryPurchaseLogVo.java b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryPurchaseLogVo.java
new file mode 100644
index 0000000..f1b2e82
--- /dev/null
+++ b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryPurchaseLogVo.java
@@ -0,0 +1,54 @@
+package com.syjiaer.clinic.server.entity.social.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author NiuZiYuan
+ * @since 2025-04-16
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("social_inventory_purchase_log_view")
+@ApiModel(value = "SocialInventoryPurchaseLogView对象", description = "")
+public class SocialInventoryPurchaseLogVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    private String inventoryPurchaseCode;
+
+    private Integer number;
+
+    private Integer uploadStatus;
+
+    private String uploadMessage;
+
+    private LocalDateTime uploadDatetime;
+
+    private Integer inventoryId;
+
+    private Integer socialType;
+
+    private String name;
+
+    private String packagingUnit;
+
+    private String minPackagingUnit;
+
+    private String hilistCode;
+}
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/common/CommonConfigMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/common/CommonConfigMapper.java
index ab3fe67..a0e70c3 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/common/CommonConfigMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/common/CommonConfigMapper.java
@@ -1,7 +1,7 @@
 package com.syjiaer.clinic.server.mapper.common;
 
-import com.syjiaer.clinic.server.entity.common.CommonConfig;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.syjiaer.clinic.server.entity.common.CommonConfig;
 
 
 /**
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/common/CommonLogMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/common/CommonLogMapper.java
index abc4688..3a4daa0 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/common/CommonLogMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/common/CommonLogMapper.java
@@ -1,7 +1,7 @@
 package com.syjiaer.clinic.server.mapper.common;
 
-import com.syjiaer.clinic.server.entity.common.CommonLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.syjiaer.clinic.server.entity.common.CommonLog;
 
 
 /**
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryApplyLogMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryApplyLogMapper.java
index 1002181..049a48d 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryApplyLogMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryApplyLogMapper.java
@@ -1,7 +1,7 @@
 package com.syjiaer.clinic.server.mapper.inventory;
 
-import com.syjiaer.clinic.server.entity.inventory.InventoryApplyLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.syjiaer.clinic.server.entity.inventory.InventoryApplyLog;
 
 
 /**
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryApplyMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryApplyMapper.java
index b457004..7a043c5 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryApplyMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryApplyMapper.java
@@ -1,7 +1,7 @@
 package com.syjiaer.clinic.server.mapper.inventory;
 
-import com.syjiaer.clinic.server.entity.inventory.InventoryApply;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.syjiaer.clinic.server.entity.inventory.InventoryApply;
 
 
 /**
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryCheckLogMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryCheckLogMapper.java
index 27eb2c5..73913df 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryCheckLogMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryCheckLogMapper.java
@@ -1,7 +1,7 @@
 package com.syjiaer.clinic.server.mapper.inventory;
 
-import com.syjiaer.clinic.server.entity.inventory.InventoryCheckLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.syjiaer.clinic.server.entity.inventory.InventoryCheckLog;
 
 
 /**
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryCheckMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryCheckMapper.java
index a29078e..9514341 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryCheckMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryCheckMapper.java
@@ -1,7 +1,7 @@
 package com.syjiaer.clinic.server.mapper.inventory;
 
-import com.syjiaer.clinic.server.entity.inventory.InventoryCheck;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.syjiaer.clinic.server.entity.inventory.InventoryCheck;
 
 
 /**
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryInitMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryInitMapper.java
index 8232dea..856fc63 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryInitMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryInitMapper.java
@@ -1,7 +1,7 @@
 package com.syjiaer.clinic.server.mapper.inventory;
 
-import com.syjiaer.clinic.server.entity.inventory.InventoryInit;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.syjiaer.clinic.server.entity.inventory.InventoryInit;
 
 
 /**
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryLogMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryLogMapper.java
index 0142e57..b337819 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryLogMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryLogMapper.java
@@ -1,12 +1,7 @@
 package com.syjiaer.clinic.server.mapper.inventory;
 
-import com.syjiaer.clinic.server.entity.inventory.InventoryLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
+import com.syjiaer.clinic.server.entity.inventory.InventoryLog;
 
 
 /**
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryMapper.java
index 7ce2d3a..d24e619 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryMapper.java
@@ -1,7 +1,7 @@
 package com.syjiaer.clinic.server.mapper.inventory;
 
-import com.syjiaer.clinic.server.entity.inventory.Inventory;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.syjiaer.clinic.server.entity.inventory.Inventory;
 
 
 /**
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryPurchaseLogMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryPurchaseLogMapper.java
index 72728e8..9e7ef0a 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryPurchaseLogMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryPurchaseLogMapper.java
@@ -1,7 +1,7 @@
 package com.syjiaer.clinic.server.mapper.inventory;
 
-import com.syjiaer.clinic.server.entity.inventory.InventoryPurchaseLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.syjiaer.clinic.server.entity.inventory.InventoryPurchaseLog;
 
 
 /**
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryPurchaseMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryPurchaseMapper.java
index 957ba15..1fc4137 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryPurchaseMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryPurchaseMapper.java
@@ -1,7 +1,9 @@
 package com.syjiaer.clinic.server.mapper.inventory;
 
-import com.syjiaer.clinic.server.entity.inventory.InventoryPurchase;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.syjiaer.clinic.server.entity.inventory.InventoryPurchase;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 
 /**
@@ -13,6 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2025-04-17
  */
 public interface InventoryPurchaseMapper extends BaseMapper<InventoryPurchase> {
-
+    @Select("select * from inventory_purchase where code = #{code}")
+    InventoryPurchase getByCode(@Param("code") String inventoryPurchaseCode);
 }
 
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventorySupplierMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventorySupplierMapper.java
index a41ef7b..8c35fd2 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventorySupplierMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventorySupplierMapper.java
@@ -1,7 +1,7 @@
 package com.syjiaer.clinic.server.mapper.inventory;
 
-import com.syjiaer.clinic.server.entity.inventory.InventorySupplier;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.syjiaer.clinic.server.entity.inventory.InventorySupplier;
 
 
 /**
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/item/ItemMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/item/ItemMapper.java
index 38c19f2..8a0360c 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/item/ItemMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/item/ItemMapper.java
@@ -1,7 +1,7 @@
 package com.syjiaer.clinic.server.mapper.item;
 
-import com.syjiaer.clinic.server.entity.item.Item;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.syjiaer.clinic.server.entity.item.Item;
 
 
 /**
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/manager/ManagerUserMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/manager/ManagerUserMapper.java
index bbafcd1..5b07a20 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/manager/ManagerUserMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/manager/ManagerUserMapper.java
@@ -1,7 +1,7 @@
 package com.syjiaer.clinic.server.mapper.manager;
 
-import com.syjiaer.clinic.server.entity.manager.ManagerUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.syjiaer.clinic.server.entity.manager.ManagerUser;
 
 
 /**
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/patient/PatientRegistrationMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/patient/PatientRegistrationMapper.java
index fd557f1..e57bf58 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/patient/PatientRegistrationMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/patient/PatientRegistrationMapper.java
@@ -2,7 +2,6 @@ package com.syjiaer.clinic.server.mapper.patient;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.syjiaer.clinic.server.entity.patient.PatientRegistration;
-import org.mapstruct.Mapper;
 
 
 /**
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryLimitMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryLimitMapper.java
index d63ac32..f84d69c 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryLimitMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryLimitMapper.java
@@ -1,8 +1,9 @@
 package com.syjiaer.clinic.server.mapper.social;
 
-import com.syjiaer.clinic.server.entity.social.SocialDirectoryLimit;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.syjiaer.clinic.server.entity.social.SocialDirectoryLimit;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.Map;
 
@@ -17,6 +18,7 @@ import java.util.Map;
  */
 public interface SocialDirectoryLimitMapper extends BaseMapper<SocialDirectoryLimit> {
 
-    Map<String, Object> getByCode(@Param("code") String hilistCode);
+    @Select("select * from social_directory_limit where code = #{code}")
+    SocialDirectoryLimit selectByCode(@Param("code") String code);
 }
 
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryMapper.java
index 1718835..3c341a1 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryMapper.java
@@ -1,9 +1,10 @@
 package com.syjiaer.clinic.server.mapper.social;
 
-import com.syjiaer.clinic.server.entity.social.SocialDirectory;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.syjiaer.clinic.server.entity.social.dto.SocialDirectoryView;
+import com.syjiaer.clinic.server.entity.social.SocialDirectory;
+import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -19,5 +20,7 @@ import java.util.List;
 public interface SocialDirectoryMapper extends BaseMapper<SocialDirectory> {
 
     List<SocialDirectoryView> selectSocialDirectoryView(@Param("codeList") List<String> codeList);
+    @Select("select * from social_directory where code = #{code}")
+    SocialDirectory getByCode(@Param("code") String code);
 }
 
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectorySelfMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectorySelfMapper.java
index c0ad691..b09772f 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectorySelfMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectorySelfMapper.java
@@ -1,7 +1,9 @@
 package com.syjiaer.clinic.server.mapper.social;
 
-import com.syjiaer.clinic.server.entity.social.SocialDirectorySelf;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.syjiaer.clinic.server.entity.social.SocialDirectorySelf;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 
 /**
@@ -13,6 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2025-04-17
  */
 public interface SocialDirectorySelfMapper extends BaseMapper<SocialDirectorySelf> {
-
+    @Select("select * from social_directory_self where code = #{code}")
+    SocialDirectorySelf selectByCode(@Param("code") String code);
 }
 
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryUpinfoMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryUpinfoMapper.java
index 18c6e3a..389d7ca 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryUpinfoMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryUpinfoMapper.java
@@ -1,7 +1,9 @@
 package com.syjiaer.clinic.server.mapper.social;
 
-import com.syjiaer.clinic.server.entity.social.SocialDirectoryUpinfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.syjiaer.clinic.server.entity.social.SocialDirectoryUpinfo;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 
 /**
@@ -13,6 +15,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2025-04-17
  */
 public interface SocialDirectoryUpinfoMapper extends BaseMapper<SocialDirectoryUpinfo> {
+    @Select("select * from social_directory_upinfo where code = #{code}")
+    SocialDirectoryUpinfo selectByCode(@Param("code") String code);
 
 }
 
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryVersionMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryVersionMapper.java
index d271fbd..2e6c0a2 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryVersionMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryVersionMapper.java
@@ -1,7 +1,7 @@
 package com.syjiaer.clinic.server.mapper.social;
 
-import com.syjiaer.clinic.server.entity.social.SocialDirectoryVersion;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.syjiaer.clinic.server.entity.social.SocialDirectoryVersion;
 
 
 /**
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryViewMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryViewMapper.java
index 500f860..715eaae 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryViewMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryViewMapper.java
@@ -1,7 +1,7 @@
 package com.syjiaer.clinic.server.mapper.social;
 
-import com.syjiaer.clinic.server.entity.social.dto.SocialDirectoryView;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView;
 
 
 /**
diff --git a/src/main/java/com/syjiaer/clinic/server/service/BaseService.java b/src/main/java/com/syjiaer/clinic/server/service/BaseService.java
index f07eb07..2bc9d9d 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/BaseService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/BaseService.java
@@ -1,9 +1,8 @@
 package com.syjiaer.clinic.server.service;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.syjiaer.clinic.server.common.exception.VerifyException;
 import com.syjiaer.clinic.server.common.util.HeadersUtil;
 import com.syjiaer.clinic.server.common.util.InfoUtil;
 import com.syjiaer.clinic.server.common.util.ParmsUtil;
@@ -11,18 +10,15 @@ import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.entity.common.CommonLog;
 import com.syjiaer.clinic.server.entity.manager.ManagerUser;
 import com.syjiaer.clinic.server.mapper.common.CommonLogMapper;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jws;
-import io.jsonwebtoken.JwtException;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.security.Keys;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.unit.DataUnit;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 public abstract class BaseService {
     @Autowired
@@ -33,7 +29,8 @@ public abstract class BaseService {
     private HeadersUtil headersUtil;
     @Autowired
     private CommonLogMapper commonLogMapper;
-
+    @Value("${jwt.expiration}")
+    protected long jwtExpiration;
     @Value("${jwt.secret}")
     protected String jwtSecret;
     /*
@@ -56,7 +53,7 @@ public abstract class BaseService {
         Map<String, Object> map = infoUtil.getMap();
         if (map == null || map.get("manager_id") == null) {
             ManagerUser managerUser = new ManagerUser();
-            managerUser.setId(0);
+            managerUser.setId(1);
             managerUser.setName("test");
             managerUser.setUsername("test");
             return managerUser;
@@ -77,7 +74,7 @@ public abstract class BaseService {
         if (orderByStr == null || orderByStr.isEmpty()){
             queryWrapper.orderBy(true,isAsc,orderByStr);
         }
-        queryWrapper.last("LIMIT " + (pageNum - 1) * pageSize + ", " + pageSize);
+        queryWrapper.last("LIMIT " +  pageSize + " OFFSET " + (pageNum - 1) * pageSize);
         List<T> list = mapper.selectList(queryWrapper);
         Page<T> page = new Page<>();
         page.setList(list);
@@ -100,4 +97,8 @@ public abstract class BaseService {
     protected Map<String, Object> getInfos() {
         return infoUtil.getMap();
     }
+    protected <T, V> List<V> listObjs(Wrapper<T> queryWrapper, BaseMapper<T> mapper,Function<? super Object, V> function) {
+        return (List)mapper.selectObjs(queryWrapper).stream().filter(Objects::nonNull).map(function).collect(Collectors.toList());
+    }
+
 }
diff --git a/src/main/java/com/syjiaer/clinic/server/service/common/FileService.java b/src/main/java/com/syjiaer/clinic/server/service/common/FileService.java
new file mode 100644
index 0000000..e61a1e8
--- /dev/null
+++ b/src/main/java/com/syjiaer/clinic/server/service/common/FileService.java
@@ -0,0 +1,94 @@
+package com.syjiaer.clinic.server.service.common;
+
+import com.syjiaer.clinic.server.common.exception.MessageException;
+import com.syjiaer.clinic.server.service.BaseService;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.UUID;
+
+@Service
+public class FileService extends BaseService {
+
+    public String uploadFile(MultipartFile file) {
+        String fileName = generateTempFileName(file);
+        if (file.isEmpty()) {
+            throw new MessageException("文件为空");
+        }
+        try {
+            // 保存文件到指定路径
+            String uploadPath = "D:/uploads/";
+            Path dir = Path.of(uploadPath);
+            // 如果目录不存在，则创建目录
+            if (!Files.exists(dir)) {
+                Files.createDirectories(dir);
+            }
+            String filePath = uploadPath +fileName;
+            file.transferTo(new File(filePath));
+          return fileName;
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new MessageException("文件上传失败:"+e.getMessage());
+        }
+    }
+
+    private String generateTempFileName(MultipartFile file) {
+        // 获取文件的后缀名
+        String originalFilename = file.getOriginalFilename();
+        String fileExtension = null;
+        if (originalFilename != null) {
+            fileExtension = originalFilename.substring(originalFilename.lastIndexOf("."));
+        }
+
+        // 生成唯一的临时文件名并返回
+        return UUID.randomUUID() + fileExtension;
+    }
+
+    public ResponseEntity<Resource> getImage(String fileName) {
+        if (fileName == null) {
+            throw new MessageException("文件名不能为空");
+        }
+        try {
+            // 指定文件保存的目录
+            Path uploadPath = Paths.get("D:/uploads/");
+
+            // 构建完整的文件路径
+            Path filePath = uploadPath.resolve(fileName);
+
+            // 检查文件是否存在
+            if (!Files.exists(filePath)) {
+                throw new MessageException("文件不存在");
+            }
+            String contentType = Files.probeContentType(filePath);
+            if (contentType == null) {
+                contentType = "application/octet-stream"; // 默认类型
+            }
+
+            // 返回文件资源
+            Resource resource = new UrlResource(filePath.toUri());
+            if (!resource.exists()) {
+                throw new MessageException("无法读取文件");
+            }
+            HttpHeaders headers = new HttpHeaders();
+            headers.add(HttpHeaders.CONTENT_TYPE, contentType);
+            return ResponseEntity.ok()
+                    .headers(headers)
+                    .body(resource);
+        } catch (MalformedURLException e) {
+            throw new MessageException("文件路径无效"+e.getMessage());
+        } catch (IOException e) {
+            throw new MessageException("未知文件类型");
+        }
+    }
+
+}
diff --git a/src/main/java/com/syjiaer/clinic/server/service/common/ManagerUserService.java b/src/main/java/com/syjiaer/clinic/server/service/common/ManagerUserService.java
new file mode 100644
index 0000000..b36b017
--- /dev/null
+++ b/src/main/java/com/syjiaer/clinic/server/service/common/ManagerUserService.java
@@ -0,0 +1,51 @@
+package com.syjiaer.clinic.server.service.common;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.syjiaer.clinic.server.common.exception.MessageException;
+import com.syjiaer.clinic.server.controller.BaseController;
+import com.syjiaer.clinic.server.entity.manager.ManagerUser;
+import com.syjiaer.clinic.server.mapper.manager.ManagerUserMapper;
+import com.syjiaer.clinic.server.service.BaseService;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.security.Keys;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.crypto.SecretKey;
+import java.util.Date;
+
+@Service
+public class ManagerUserService extends BaseService {
+    @Autowired
+    private ManagerUserMapper managerUserMapper;
+
+    public String login(String username, String password) {
+        if (username == null || username.isEmpty()) {
+            throw new MessageException("请输入用户名");
+        }
+        if (password == null || password.isEmpty()) {
+            throw new MessageException("请输入密码");
+        }
+        ManagerUser managerUser = managerUserMapper.selectOne(new QueryWrapper<ManagerUser>().eq("username", username).eq("password", password));
+        if (managerUser == null) {
+            throw new MessageException("用户名或密码错误");
+        }
+        Date exdata = new Date(System.currentTimeMillis() + jwtExpiration * 1000);
+        System.out.println(exdata);
+        SecretKey key = Keys.hmacShaKeyFor(jwtSecret.getBytes());
+        String token = Jwts.builder()
+                .subject(managerUser.getId().toString()) // 用户ID作为主题
+                .expiration(exdata)
+                .claim("username", managerUser.getUsername()) // 添加自定义声明
+                .claim("name", managerUser.getName()) // 添加自定义声明
+                .claim("userId", managerUser.getId())
+                .signWith(key)
+                .compact();
+        return token;
+    }
+
+    public ManagerUser verify() {
+    return getManagerUser();
+    }
+}
diff --git a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsCateService.java b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsCateService.java
index 6d75e24..576ee1e 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsCateService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsCateService.java
@@ -2,13 +2,13 @@ package com.syjiaer.clinic.server.service.goods;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.entity.goods.Goods;
 import com.syjiaer.clinic.server.entity.goods.GoodsCate;
 import com.syjiaer.clinic.server.mapper.goods.GoodsCateMapper;
 import com.syjiaer.clinic.server.mapper.goods.GoodsMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,6 +42,7 @@ public class GoodsCateService {
      * 删除分类
      * 参数 id 分类id
      */
+    @Transactional(rollbackFor = Exception.class)
     public void del(int id){
         GoodsCate goodsCate = goodsCateMapper.selectById(id);
         goodsCateMapper.deleteById(id);
diff --git a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java
index ed8baee..5d07f2f 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java
@@ -15,15 +15,13 @@ import com.syjiaer.clinic.server.entity.goods.Goods;
 import com.syjiaer.clinic.server.entity.goods.dto.GoodsQuery;
 import com.syjiaer.clinic.server.entity.goods.vo.GoodsDetailVo;
 import com.syjiaer.clinic.server.entity.inventory.Inventory;
-import com.syjiaer.clinic.server.entity.social.SocialDirectory;
-import com.syjiaer.clinic.server.entity.social.dto.SocialDirectoryView;
+import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView;
 import com.syjiaer.clinic.server.mapper.goods.GoodsMapper;
 import com.syjiaer.clinic.server.mapper.inventory.InventoryMapper;
 import com.syjiaer.clinic.server.service.social.SocialDirectoryService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -111,7 +109,7 @@ public class GoodsService {
         }
 
         Inventory latestInventory = inventories.get(0);
-        SocialDirectory socialDirectory = socialDirectoryService.getByCode(goods.getHilistCode());
+        SocialDirectoryView socialDirectory = socialDirectoryService.fullInfo(goods.getHilistCode());
         IM3501 im3501 = new IM3501();
         BigDecimal number = new BigDecimal(goods.getInventoryWholeNumber());
         BigDecimal price =goods.getUnitPrice();
diff --git a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryApplyService.java b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryApplyService.java
index 3611ff8..77bea13 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryApplyService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryApplyService.java
@@ -8,7 +8,6 @@ import com.syjiaer.clinic.server.common.enums.InventoryTypeEnum;
 import com.syjiaer.clinic.server.common.enums.Type;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.vo.Page;
-import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.entity.inventory.InventoryApply;
 import com.syjiaer.clinic.server.entity.inventory.InventoryApplyLog;
 import com.syjiaer.clinic.server.entity.inventory.InventoryLog;
@@ -21,7 +20,6 @@ import com.syjiaer.clinic.server.service.BaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
diff --git a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryCheckService.java b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryCheckService.java
index 76b71ed..732331e 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryCheckService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryCheckService.java
@@ -39,7 +39,7 @@ public class InventoryCheckService extends BaseService {
         return pageHelper(query.getPageNum(), query.getPageSize(),
                 queryWrapper, inventoryCheckMapper, "create_datetime", false);
     }
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void save(List<Map> list, String remark) {
         ManagerUser user = getManagerUser();
         System.out.println(remark);
diff --git a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryPurchaseService.java b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryPurchaseService.java
index b7d717a..e229c93 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryPurchaseService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryPurchaseService.java
@@ -6,7 +6,6 @@ import com.syjiaer.clinic.server.common.constants.Constants;
 import com.syjiaer.clinic.server.common.enums.*;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.vo.Page;
-import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.entity.goods.Goods;
 import com.syjiaer.clinic.server.entity.inventory.*;
 import com.syjiaer.clinic.server.entity.inventory.dto.PurchaseOrderQuery;
@@ -21,6 +20,7 @@ import com.syjiaer.clinic.server.service.goods.GoodsService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -55,6 +55,7 @@ public class InventoryPurchaseService extends BaseService {
     * @param inventoryPurchase 采购订单
     * @param list 采购项
      */
+    @Transactional(rollbackFor = Exception.class)
     public void create(InventoryPurchase inventoryPurchase, List<Inventory> list) {
         if (inventoryPurchase.getInvoiceCode() == null || inventoryPurchase.getInvoiceCode().isEmpty()) {
             inventoryPurchase.setInvoiceCode("无");
@@ -67,27 +68,19 @@ public class InventoryPurchaseService extends BaseService {
                 throw new MessageException("[" + inventory_goods.getName() + "]采购单价不能小于等于0");
             }
         }
-        createOrder(inventoryPurchase, list);
-    }
-    /*
-    * 创建采购订单
-    * @param inventoryOrder 采购订单
-    * @param list 采购项
-     */
-    public void createOrder(InventoryPurchase inventoryOrder, List<Inventory> list) {
         //构造订单
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
         String datePart = sdf.format(new Date());
         String code = Constants.IPurchaseCodePrefix + datePart;
-        inventoryOrder.setCode(code);
-        inventoryOrder.setCreateDatetime(LocalDateTime.now());
-        inventoryOrder.setKindCount(list.size());
+        inventoryPurchase.setCode(code);
+        inventoryPurchase.setCreateDatetime(LocalDateTime.now());
+        inventoryPurchase.setKindCount(list.size());
         BigDecimal total_price = new BigDecimal(0);
         for (Inventory inventory : list) {
             total_price = total_price.add(inventory.getPurchaseUnitPrice().multiply(new BigDecimal(inventory.getWholeNumber())));
         }
-        inventoryOrder.setTotalPrice(total_price);
-        inventoryPurchaseMapper.insert(inventoryOrder);
+        inventoryPurchase.setTotalPrice(total_price);
+        inventoryPurchaseMapper.insert(inventoryPurchase);
 
         for (Inventory inventory : list) {
             //更新库存信息
@@ -179,6 +172,7 @@ public class InventoryPurchaseService extends BaseService {
      * 已有采购单，添加新商品
      * @param inventory 采购的商品
      */
+    @Transactional(rollbackFor = Exception.class)
     public void addOneGoods(Inventory inventory) {
         QueryWrapper<InventoryPurchase> orderWrapper = new QueryWrapper();
         orderWrapper.eq("code", inventory.getInventoryPurchaseCode());
@@ -337,6 +331,7 @@ public class InventoryPurchaseService extends BaseService {
      * 采购单中商品退货
      * @param list inventory表idList
      */
+    @Transactional(rollbackFor = Exception.class)
     public void returnable(List<Integer> list) {
 
         ManagerUser user = getManagerUser();
diff --git a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java
index 5e35e13..3f3582e 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java
@@ -8,10 +8,11 @@ import com.syjiaer.clinic.server.common.enums.InventoryTypeEnum;
 import com.syjiaer.clinic.server.common.enums.Type;
 import com.syjiaer.clinic.server.common.enums.UploadStatusEnum;
 import com.syjiaer.clinic.server.common.exception.MessageException;
-import com.syjiaer.clinic.server.common.util.DateUtil;
-import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.entity.goods.Goods;
-import com.syjiaer.clinic.server.entity.inventory.*;
+import com.syjiaer.clinic.server.entity.inventory.Inventory;
+import com.syjiaer.clinic.server.entity.inventory.InventoryLog;
+import com.syjiaer.clinic.server.entity.inventory.InventoryPurchase;
+import com.syjiaer.clinic.server.entity.inventory.InventoryPurchaseLog;
 import com.syjiaer.clinic.server.entity.manager.ManagerUser;
 import com.syjiaer.clinic.server.mapper.goods.GoodsMapper;
 import com.syjiaer.clinic.server.mapper.inventory.InventoryLogMapper;
@@ -24,9 +25,9 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -49,6 +50,9 @@ public class InventoryService extends BaseService {
     private InventoryPurchaseMapper inventoryPurchaseMapper;
     @Autowired
     private InventoryPurchaseLogMapper inventoryPurchaseLogMapper;
+    @Autowired
+    @Lazy
+    private InventoryService inventoryService;
 
     public List<Inventory> listByOrderCode(String orderCode) {
         QueryWrapper<Inventory> queryWrapper = new QueryWrapper<>();
@@ -487,11 +491,11 @@ public class InventoryService extends BaseService {
                     .eq("good_id", goodsId)
                     .orderByDesc("create_datetime").last("limit 1"));
 
-            list.add(this.changeNumber(inventory.getId(), Type.IN, changeWhole, changeFragment, remark));
+            list.add(inventoryService.changeNumber(inventory.getId(), Type.IN, changeWhole, changeFragment, remark));
         } else {
             changeFragment = -changeFragment;
             changeWhole = -changeWhole;
-            list = this.outByGoodsId(goodsId, changeWhole, changeFragment, remark);
+            list = inventoryService.outByGoodsId(goodsId, changeWhole, changeFragment, remark);
         }
         return list;
     }
@@ -531,7 +535,7 @@ public class InventoryService extends BaseService {
             int deductFragment = deduct % goods.getMinPackagingNumber();
 
             // 调用现有方法执行出库
-            result.add(this.changeNumber(inv.getId(), Type.OUT, deductWhole, deductFragment, remark));
+            result.add(inventoryService.changeNumber(inv.getId(), Type.OUT, deductWhole, deductFragment, remark));
 
             // 更新剩余需要扣除量
             requiredTotalFragment -= deduct;
diff --git a/src/main/java/com/syjiaer/clinic/server/service/item/ItemGroupService.java b/src/main/java/com/syjiaer/clinic/server/service/item/ItemGroupService.java
index c1fccb9..d5b6c6e 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/item/ItemGroupService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/item/ItemGroupService.java
@@ -5,7 +5,6 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.vo.Page;
-import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.entity.item.Item;
 import com.syjiaer.clinic.server.entity.item.ItemGroup;
 import com.syjiaer.clinic.server.entity.item.param.ItemGroupParam;
@@ -14,6 +13,7 @@ import com.syjiaer.clinic.server.mapper.item.ItemMapper;
 import com.syjiaer.clinic.server.service.BaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -52,6 +52,7 @@ public class ItemGroupService extends BaseService {
      * 保存/修改项目组
      * @param itemGroupParam 项目组参数
      */
+    @Transactional(rollbackFor = Exception.class)
     public void saveItemGroup(ItemGroupParam itemGroupParam) {
         if (itemGroupParam.getId() != null) {
             QueryWrapper<ItemGroup> queryWrapper = new QueryWrapper<>();
diff --git a/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java b/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java
index d3a991f..9d63b25 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java
@@ -3,16 +3,15 @@ package com.syjiaer.clinic.server.service.item;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.vo.Page;
-import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.entity.item.Item;
 import com.syjiaer.clinic.server.entity.manager.ManagerUser;
 import com.syjiaer.clinic.server.mapper.item.ItemMapper;
 import com.syjiaer.clinic.server.service.BaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -69,7 +68,7 @@ public class ItemService extends BaseService {
         item.setUpdateDatetime(LocalDateTime.now());
         itemMapper.updateById(item);
     }
-
+    @Transactional(rollbackFor = Exception.class)
     public void del(Integer id) {
         if (id == null) {
             throw new MessageException("id参数为空");
diff --git a/src/main/java/com/syjiaer/clinic/server/service/medical/MedicalRecordService.java b/src/main/java/com/syjiaer/clinic/server/service/medical/MedicalRecordService.java
index 6fd36a3..678ae06 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/medical/MedicalRecordService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/medical/MedicalRecordService.java
@@ -15,15 +15,13 @@ import com.syjiaer.clinic.server.mapper.item.ItemMapper;
 import com.syjiaer.clinic.server.mapper.medical.MedicalRecordDetailMapper;
 import com.syjiaer.clinic.server.mapper.medical.MedicalRecordMapper;
 import com.syjiaer.clinic.server.service.BaseService;
-import com.syjiaer.clinic.server.service.goods.GoodsService;
-import com.syjiaer.clinic.server.service.item.ItemService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 @Service
 public class MedicalRecordService extends BaseService {
@@ -40,6 +38,7 @@ public class MedicalRecordService extends BaseService {
     * 保存
     * @param saveDto 病历信息
      */
+    @Transactional(rollbackFor = Exception.class)
     public void save(MedicalRecordSaveDto saveDto) {
         ManagerUser managerUser = getManagerUser();
         MedicalRecord medicalRecord = new MedicalRecord();
@@ -85,6 +84,7 @@ public class MedicalRecordService extends BaseService {
      * @param patientId
      * @return
      */
+
     public List<MedicalRecordVo> listByPatientId(Integer patientId) {
         QueryWrapper<MedicalRecord> query = new QueryWrapper<>();
         query.eq("patient_id", patientId);
diff --git a/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java b/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java
index f7e32db..4218395 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java
@@ -4,12 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.util.FileUtil;
 import com.syjiaer.clinic.server.common.vo.Page;
-import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.entity.organization.OrganizationMember;
 import com.syjiaer.clinic.server.mapper.organization.OrganizationMemberMapper;
 import com.syjiaer.clinic.server.service.BaseService;
 import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationSectionService.java b/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationSectionService.java
index 782ed23..b03443e 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationSectionService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationSectionService.java
@@ -6,14 +6,12 @@ import com.syjiaer.clinic.server.common.config.Config;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.util.StringUtil;
 import com.syjiaer.clinic.server.common.vo.Page;
-import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.entity.organization.OrganizationSection;
 import com.syjiaer.clinic.server.mapper.organization.OrganizationSectionMapper;
 import com.syjiaer.clinic.server.service.BaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -63,6 +61,7 @@ public class OrganizationSectionService extends BaseService {
      * 添加科室
      * @param organizationSection
      */
+    @Transactional(rollbackFor = Exception.class)
     public void add(OrganizationSection organizationSection) {
         String socialInsuplcAdmdvs = config.get("social", "insuplcAdmdvs");
         long count = organizationSectionMapper.selectCount(new QueryWrapper<OrganizationSection>().eq("code", organizationSection.getCode()));
@@ -100,7 +99,7 @@ public class OrganizationSectionService extends BaseService {
 //        }
 
     }
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void edit(OrganizationSection organizationSection) {
         String caty = organizationSection.getCaty();
         String processing = getString(caty);
@@ -134,7 +133,7 @@ public class OrganizationSectionService extends BaseService {
 
 
 
-
+    @Transactional(rollbackFor = Exception.class)
     public void delete(Integer id) {
         OrganizationSection organizationSection = organizationSectionMapper.selectById(id);
         if (organizationSection == null){
@@ -156,8 +155,7 @@ public class OrganizationSectionService extends BaseService {
     public OrganizationSection get(int id) {
         QueryWrapper<OrganizationSection> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("del_flag", 0).eq("id", id);
-        OrganizationSection organizationSection = organizationSectionMapper.selectOne(queryWrapper);
-        return organizationSection;
+        return organizationSectionMapper.selectOne(queryWrapper);
     }
     public List<JSONObject> allList() {
         QueryWrapper<OrganizationSection> organizationSectionQueryWrapper = new QueryWrapper<>();
diff --git a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientInfoService.java b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientInfoService.java
index e4b7b9e..3db35e3 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientInfoService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientInfoService.java
@@ -1,19 +1,7 @@
 package com.syjiaer.clinic.server.service.patient;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.syjiaer.clinic.server.common.exception.MessageException;
-import com.syjiaer.clinic.server.entity.patient.PatientInfo;
-import com.syjiaer.clinic.server.entity.patient.PatientRegistration;
-import com.syjiaer.clinic.server.mapper.patient.PatientInfoMapper;
-import com.syjiaer.clinic.server.mapper.patient.PatientRegistrationMapper;
 import com.syjiaer.clinic.server.service.BaseService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
 @Service
 public class PatientInfoService extends BaseService {
 
diff --git a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java
index 79057ec..40269e0 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java
@@ -19,6 +19,7 @@ import com.syjiaer.clinic.server.service.BaseService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -44,6 +45,7 @@ public class PatientRegistrationService extends BaseService {
      * 挂号
      * @param patientRegistrationParam 挂号信息
      */
+    @Transactional(rollbackFor = Exception.class)
     public void registration(PatientRegistration registrationParam) {
         //TODO 挂号和患者 记录身份证号非必填
         if (registrationParam == null) {
@@ -131,7 +133,6 @@ public class PatientRegistrationService extends BaseService {
     public Page<PatientRegistration> getPageByType(RegistrationQuery query) {
         QueryWrapper<PatientRegistration> regisQuery = new QueryWrapper<>();
         regisQuery.eq("del_flag", 0);
-        regisQuery.orderByAsc("create_datetime");
         if (query.getStatus() != null) {
             regisQuery.eq("status", query.getStatus());
         }
@@ -153,16 +154,13 @@ public class PatientRegistrationService extends BaseService {
      * 按时间范围分页查询挂号信息
      * @param page
      * @param size
-     * @param date
+     * @param startDate
+     * @param endDate
      * @return
      */
 
-    public Page<PatientRegistration> listPage(int page, int size, String date) {
-        if (date == null || date.isEmpty()) {
-            date = LocalDate.now().toString();
-        }
-        String startDate = date + " 00:00:00";
-        String endDate = date + " 23:59:59";
+    public Page<PatientRegistration> listPage(int page, int size, String startDate,String endDate) {
+
         QueryWrapper<PatientRegistration> queryWrapper = new QueryWrapper<>();
         //查询条件
         queryWrapper.between("create_datetime", DateUtil.getDateTime(startDate), DateUtil.getDateTime(endDate));
diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryLimitService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryLimitService.java
index f7cbcb4..13ab285 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryLimitService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryLimitService.java
@@ -8,6 +8,7 @@ import com.syjiaer.clinic.server.entity.social.SocialDirectoryLimit;
 import com.syjiaer.clinic.server.mapper.social.SocialDirectoryLimitMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -30,6 +31,7 @@ public class SocialDirectoryLimitService {
      * @param updtTime 更新时间
      * @param pageNum 页码
      */
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> updateSocial(String updtTime, int pageNum) {
         if (updtTime == null || updtTime.trim().isEmpty()) {
             // 处理参数为空的情况，这里假设返回一个错误结果
diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectorySelfService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectorySelfService.java
index 1fa02ac..f94ad69 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectorySelfService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectorySelfService.java
@@ -8,13 +8,13 @@ import com.syjiaer.clinic.server.entity.social.SocialDirectorySelf;
 import com.syjiaer.clinic.server.mapper.social.SocialDirectorySelfMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 /*
  * 自付比例
@@ -30,6 +30,7 @@ public class SocialDirectorySelfService {
      * @param updtTime 更新时间
      * @param pageNum 页码
      */
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> updateSocial(String updtTime, int pageNum) {
         if (updtTime == null) {
             throw new MessageException("updtTime不能为空");
diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java
index 7daa0cb..e6d706a 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java
@@ -8,14 +8,13 @@ import com.syjiaer.clinic.server.common.config.Config;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.util.*;
 import com.syjiaer.clinic.server.common.vo.Page;
-import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.entity.social.*;
-import com.syjiaer.clinic.server.entity.social.dto.SocialDirectoryView;
+import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView;
 import com.syjiaer.clinic.server.mapper.social.*;
 import com.syjiaer.clinic.server.service.BaseService;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -61,6 +60,7 @@ public class SocialDirectoryService extends BaseService {
      * @param version_name 版本名称
      * @param type 类型
      */
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> download(String version_name, int type) {
         Integer[] type_list = {1301, 1302, 1305, 1306, 1307, 1309, 1314, 1315, 1320, 1321};
         //判断type在数组中
@@ -209,8 +209,13 @@ public class SocialDirectoryService extends BaseService {
         hashMap.put("pre_version_name", version_name);
         return hashMap;
     }
-
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> download2(String pre_version_name, int type) {
+        Integer[] type_list = {1361, 1362, 1363};
+        //判断type在数组中
+        if (!Arrays.asList(type_list).contains(type)) {
+           throw new MessageException("参数 type 不能为空");
+        }
         Map<String, Object> input = new HashMap<>();
         input.put("ver", pre_version_name);
         String infno = String.valueOf(type);
@@ -485,26 +490,80 @@ public class SocialDirectoryService extends BaseService {
             return null;
         }
         SocialDirectoryView socialDirectoryView = JSONObject.parseObject(JSONObject.toJSONString(socialDirectory), SocialDirectoryView.class);
-        SocialDirectoryUpinfo socialDirectoryUpinfo = socialDirectoryUpinfoMapper.selectById(code);
+        SocialDirectoryUpinfo socialDirectoryUpinfo = socialDirectoryUpinfoMapper.selectByCode(code);
         if (socialDirectoryUpinfo != null) {
-            BeanUtils.copyProperties(socialDirectoryUpinfo, socialDirectoryView);
+            socialDirectoryUpinfo.setBegndate( socialDirectoryUpinfo.getBegndate());
+            socialDirectoryView.setEnddate( socialDirectoryUpinfo.getEnddate());
+            socialDirectoryView.setWubi( socialDirectoryUpinfo.getWubi());
+            socialDirectoryView.setPinyin( socialDirectoryUpinfo.getPinyin());
         }
-        SocialDirectoryLimit socialDirectoryLimit = socialDirectoryLimitMapper.selectById(code);
+        SocialDirectoryLimit socialDirectoryLimit = socialDirectoryLimitMapper.selectByCode(code);
         if (socialDirectoryLimit != null) {
-            BeanUtils.copyProperties(socialDirectoryLimit, socialDirectoryView);
+            socialDirectoryView.setHilistPricUplmtAmt( socialDirectoryLimit.getHilistPricUplmtAmt());
+            socialDirectoryView.setHilistLmtpricType( socialDirectoryLimit.getHilistLmtpricType());
         }
-        SocialDirectorySelf socialDirectorySelf = socialDirectorySelfMapper.selectById(code);
+        SocialDirectorySelf socialDirectorySelf = socialDirectorySelfMapper.selectByCode(code);
         if (socialDirectorySelf != null) {
-            BeanUtils.copyProperties(socialDirectorySelf, socialDirectoryView);
+            socialDirectoryView.setSelfpayPropType( socialDirectorySelf.getSelfpayPropType());
+            socialDirectoryView.setSelfpayProp( socialDirectorySelf.getSelfpayProp());
         }
         return socialDirectoryView;
     }
 
 
-    public SocialDirectory getByCode(String hilistCode) {
+    public SocialDirectoryView getByCode(String hilistCode) {
+        return fullInfo(hilistCode);
+    }
+
+    public Page<SocialDirectoryView> getDocList(int type, int page, int size, String keyword) {
+        Integer[] type_list = {1301, 1302, 1305, 1306, 1307, 1309, 1314, 1315, 1320, 1321};
+        //判断type在数组中
+        if (!Arrays.asList(type_list).contains(type)) {
+            throw new MessageException("参数 type 不能为空");
+        }
+        QueryWrapper<SocialDirectory> codeqw = new QueryWrapper<>();
+        codeqw.eq("type", type);
+
+        //模糊搜索
+        if (!keyword.trim().isEmpty()) {
+            codeqw.like("name", keyword);
+            codeqw.or().like("code", keyword);
+            codeqw.or().like("keyword", keyword);
+        }
+        // 执行查询
+
+        codeqw.select("code");
+        long count=socialDirectoryMapper.selectCount(codeqw);
+
+        codeqw.last("LIMIT " + size + " OFFSET " + (page - 1) * size);
+        List<String> codeList = listObjs(codeqw, socialDirectoryMapper,obj -> obj.toString());
+        Page<SocialDirectoryView> result = new Page<>();
+        if (!codeList.isEmpty()){
+            List<SocialDirectoryView> list = fullList(codeList);
+            result.setList(list);
+        }else{
+            result.setList(new ArrayList<>());
+        }
+
+        result.setTotal_count(count);
+        result.setTotal_page((int) Math.ceil((double) count / size));
+        return result;
+
+    }
+
+    /**
+     * 搜索诊断列表
+     * @param keyword
+     * @return
+     */
+    public List<SocialDirectory> getDiagnosis(String keyword) {
         QueryWrapper<SocialDirectory> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("code", hilistCode)
-                .last("limit 1");
-        return socialDirectoryMapper.selectOne(queryWrapper);
+        queryWrapper.eq("type", 1307);
+        if (keyword != null &&!keyword.isEmpty()) {
+            queryWrapper.and(wrapper -> wrapper.like("name", keyword).or().like("code", keyword).or().like("keyword", keyword));
+        }
+        queryWrapper.select("code", "name", "data");
+        queryWrapper.last("limit 20");
+        return socialDirectoryMapper.selectList(queryWrapper);
     }
 }
diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryUpinfoService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryUpinfoService.java
index 695e5c7..c34a4cd 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryUpinfoService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryUpinfoService.java
@@ -1,18 +1,24 @@
 package com.syjiaer.clinic.server.service.social;
 
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.api.input.IM1312;
 import com.syjiaer.clinic.server.common.api.output.OM1312;
 import com.syjiaer.clinic.server.common.api.request.SocialRequest;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.util.DateUtil;
+import com.syjiaer.clinic.server.common.util.HttpUtil;
 import com.syjiaer.clinic.server.entity.social.SocialDirectoryUpinfo;
 import com.syjiaer.clinic.server.mapper.social.SocialDirectoryUpinfoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigInteger;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -27,13 +33,17 @@ public class SocialDirectoryUpinfoService {
     private SocialRequest socialRequest;
     @Autowired
     private SocialDirectoryUpinfoMapper socialDirectoryUpinfoMapper;
+    @Autowired
+    private HttpUtil httpUtil;
 
     private Logger logger = Logger.getLogger(this.getClass().getName());
+
     /*
      * 更新医保有效期
      * @param updtTime 更新时间
      * @param pageNum 页码
      */
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> updateSocial(String updtTime, int pageNum) {
         if (updtTime == null) {
             throw new MessageException("updtTime不能为空");
@@ -77,4 +87,90 @@ public class SocialDirectoryUpinfoService {
         map.put("pages", om1312.getPages());
         return map;
     }
+
+    public  Map<String, Object> getPage(String updtTime, int pageNum) {
+        JSONObject result = call(updtTime, pageNum);
+        int recordCounts = result.getInteger("recordCounts");
+        int pages = result.getInteger("pages");
+        JSONArray json_list = result.getJSONArray("data");
+        int number = saveJsonList(json_list);
+        Map<String, Object> result_map = new HashMap<>();
+        result_map.put("recordCounts", recordCounts);
+        result_map.put("pages", pages);
+        result_map.put("number", number);
+        return result_map;
+
+    }
+    @Transactional(rollbackFor = Exception.class)
+    private int saveJsonList(JSONArray json_list) {
+        List<SocialDirectoryUpinfo> list = new ArrayList<>();
+        for (int i = 0; i < json_list.size(); i++) {
+            JSONObject jsonObject = json_list.getJSONObject(i);
+            JSONObject new_jsonObject = new JSONObject();
+            for (String key : jsonObject.keySet()) {
+                new_jsonObject.put(toCamelCase(key), jsonObject.get(key));
+            }
+            new_jsonObject.put("code", jsonObject.getString("hilist_code"));
+            SocialDirectoryUpinfo socialDirectoryUpinfo = new_jsonObject.toJavaObject(SocialDirectoryUpinfo.class);
+            list.add(socialDirectoryUpinfo);
+        }
+        int number = 0;
+        for (int i = 0; i < list.size(); i++) {
+            SocialDirectoryUpinfo socialDirectoryUpinfo = list.get(i);
+            String code = socialDirectoryUpinfo.getCode();
+            SocialDirectoryUpinfo pre_socialDirectoryUpinfo = socialDirectoryUpinfoMapper.selectById(code);
+
+            if (pre_socialDirectoryUpinfo == null) {
+
+                socialDirectoryUpinfoMapper.insert(socialDirectoryUpinfo);
+                number++;
+            } else {
+                QueryWrapper<SocialDirectoryUpinfo> upqw = new QueryWrapper<>();
+                upqw.eq("code", code);
+                socialDirectoryUpinfoMapper.delete(upqw);
+                socialDirectoryUpinfoMapper.insert(socialDirectoryUpinfo);
+            }
+        }
+        return number;
+    }
+
+    private JSONObject call(String updt_time, int page_num) {
+        System.out.println("正在处理:" + page_num);
+        Map<String, Object> map = new HashMap<>();
+        map.put("updt_time", updt_time);
+        map.put("page_num", page_num);
+        map.put("page_size", 1000);
+        map.put("vali_flag", "1");
+        JSONObject result = httpUtil.call("1312", "data", map);
+        return result;
+    }
+
+    // 将下划线命名法转换为驼峰命名法
+    private String toCamelCase(String snakeStr) {
+        // 创建一个StringBuilder对象，用于存储转换后的字符串
+        StringBuilder camelCaseStr = new StringBuilder();
+        // 定义一个布尔变量，用于标记下一个字符是否需要大写
+        boolean nextUpperCase = false;
+
+        // 遍历输入字符串的每一个字符
+        for (char c : snakeStr.toCharArray()) {
+            // 如果字符是下划线，则将nextUpperCase设置为true
+            if (c == '_') {
+                nextUpperCase = true;
+            } else {
+                // 如果nextUpperCase为true，则将字符转换为大写，并添加到StringBuilder中
+                if (nextUpperCase) {
+                    camelCaseStr.append(Character.toUpperCase(c));
+                    // 将nextUpperCase设置为false
+                    nextUpperCase = false;
+                } else {
+                    // 如果nextUpperCase为false，则将字符转换为小写，并添加到StringBuilder中
+                    camelCaseStr.append(Character.toLowerCase(c));
+                }
+            }
+        }
+
+        // 返回转换后的字符串
+        return camelCaseStr.toString();
+    }
 }
diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java
index 4d7bd2d..87d91d2 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java
@@ -1,9 +1,497 @@
 package com.syjiaer.clinic.server.service.social;
 
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.syjiaer.clinic.server.common.api.input.IM3501;
+import com.syjiaer.clinic.server.common.api.input.IM3502;
+import com.syjiaer.clinic.server.common.api.input.IM3503;
+import com.syjiaer.clinic.server.common.api.input.IM3504;
+import com.syjiaer.clinic.server.common.api.request.SocialRequest;
+import com.syjiaer.clinic.server.common.constants.Constants;
+import com.syjiaer.clinic.server.common.enums.InventorySocialTypeEnum;
+import com.syjiaer.clinic.server.common.enums.UploadStatusEnum;
+import com.syjiaer.clinic.server.common.exception.MessageException;
+import com.syjiaer.clinic.server.common.vo.Page;
+import com.syjiaer.clinic.server.entity.goods.Goods;
+import com.syjiaer.clinic.server.entity.inventory.*;
+import com.syjiaer.clinic.server.entity.manager.ManagerUser;
+import com.syjiaer.clinic.server.entity.social.SocialDirectory;
+import com.syjiaer.clinic.server.entity.social.dto.InventoryInitQuery;
+import com.syjiaer.clinic.server.entity.social.dto.InventoryLogQuery;
+import com.syjiaer.clinic.server.entity.social.dto.InventoryPurchaseLogQuery;
+import com.syjiaer.clinic.server.entity.social.dto.RetailInventoryQuery;
+import com.syjiaer.clinic.server.entity.social.vo.NotDoNumberVo;
+import com.syjiaer.clinic.server.entity.social.vo.SocialInventoryInitVo;
+import com.syjiaer.clinic.server.entity.social.vo.SocialInventoryLogVo;
+import com.syjiaer.clinic.server.entity.social.vo.SocialInventoryPurchaseLogVo;
+import com.syjiaer.clinic.server.mapper.goods.GoodsMapper;
+import com.syjiaer.clinic.server.mapper.inventory.*;
+import com.syjiaer.clinic.server.mapper.social.SocialDirectoryMapper;
+import com.syjiaer.clinic.server.service.BaseService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
 /*
  * 医保进销存上报
  */
 @Service
-public class SocialInventoryUploadService {
+public class SocialInventoryUploadService extends BaseService {
+    @Autowired
+    private InventoryInitMapper inventoryInitMapper;
+    @Autowired
+    private InventoryPurchaseLogMapper inventoryPurchaseLogMapper;
+    @Autowired
+    private InventoryLogMapper inventoryLogMapper;
+    @Autowired
+    private InventoryMapper inventoryMapper;
+    @Autowired
+    private GoodsMapper goodsMapper;
+    @Autowired
+    private SocialDirectoryMapper socialDirectoryMapper;
+    @Autowired
+    private InventoryPurchaseMapper inventoryPurchaseMapper;
+    @Autowired
+    private SocialRequest socialRequest;
+    @Autowired
+    private InventorySupplierMapper inventorySupplierMapper;
+
+    public Page<SocialInventoryInitVo> get3501List(InventoryInitQuery initQuery) {
+        if (initQuery == null) {
+            throw new MessageException("没有带查询条件");
+        }
+        QueryWrapper<InventoryInit> queryWrapper = new QueryWrapper();
+        if (initQuery.getPageNum() == null || initQuery.getPageNum() == 0) {
+            initQuery.setPageNum(1);
+        }
+        if (initQuery.getPageSize() == null || initQuery.getPageSize() == 0) {
+            initQuery.setPageSize(Constants.DetailPageSize);
+        }
+        if (initQuery.getUploadStatus() != null && UploadStatusEnum.getByStatus(initQuery.getUploadStatus()) != null) {
+            queryWrapper.eq("upload_status", initQuery.getUploadStatus());
+        }
+        if (initQuery.getType() != null && InventorySocialTypeEnum.getByType(initQuery.getType()) != null) {
+            queryWrapper.eq("type", initQuery.getType());
+        }
+        if (initQuery.getCode() != null && !initQuery.getCode().isEmpty()) {
+            queryWrapper.like("code", initQuery.getCode());
+        }
+        if (initQuery.getCreateTimeBefore() != null) {
+            queryWrapper.ge("create_time", initQuery.getCreateTimeBefore());
+        }
+        if (initQuery.getCreateTimeAfter() != null) {
+            queryWrapper.le("create_time", initQuery.getCreateTimeAfter());
+        }
+        Page<InventoryInit> page = pageHelper(initQuery.getPageNum(), initQuery.getPageSize(), queryWrapper, inventoryInitMapper, "id", false);
+        List<SocialInventoryInitVo> voList = new ArrayList<>();
+        for (InventoryInit inventoryInit : page.getList()){
+            SocialInventoryInitVo vo = new SocialInventoryInitVo();
+            BeanUtils.copyProperties(inventoryInit, vo);
+            Goods goods = goodsMapper.selectById(inventoryInit.getGoodsId());
+            vo.setName(goods.getName());
+            vo.setPackagingUnit(goods.getPackagingUnit());
+            vo.setMinPackagingUnit(goods.getMinPackagingUnit());
+            vo.setHilistCode(goods.getHilistCode());
+            voList.add(vo);
+        }
+        Page<SocialInventoryInitVo> resultPage = new Page<>();
+        resultPage.setList(voList);
+        resultPage.setTotal_page(page.getTotal_page());
+        resultPage.setTotal_count(page.getTotal_count());
+        return resultPage;
+    }
+
+    public Page<SocialInventoryLogVo> get3502List(InventoryLogQuery logQuery) {
+        if (logQuery == null) {
+            throw new MessageException("没有带查询条件");
+        }
+        QueryWrapper<InventoryLog> queryWrapper = new QueryWrapper();
+        if (logQuery.getPageNum() == null || logQuery.getPageNum() == 0) {
+            logQuery.setPageNum(1);
+        }
+        if (logQuery.getPageSize() == null || logQuery.getPageSize() == 0) {
+            logQuery.setPageSize(Constants.DetailPageSize);
+        }
+        if (logQuery.getUploadStatus() != null && UploadStatusEnum.getByStatus(logQuery.getUploadStatus()) != null) {
+            queryWrapper.eq("upload_status", logQuery.getUploadStatus());
+        }
+        if (logQuery.getType() != null && InventorySocialTypeEnum.getByType(logQuery.getType()) != null) {
+            queryWrapper.eq("type", logQuery.getType());
+        }
+        if (logQuery.getCreateTimeBefore() != null) {
+            queryWrapper.ge("create_time", logQuery.getCreateTimeBefore());
+        }
+        if (logQuery.getCreateTimeAfter() != null) {
+            queryWrapper.le("create_time", logQuery.getCreateTimeAfter());
+        }
+        Page<InventoryLog> page = pageHelper(logQuery.getPageNum(), logQuery.getPageSize(), queryWrapper, inventoryLogMapper, "id", false);
+        List<SocialInventoryLogVo> voList = new ArrayList<>();
+       for (InventoryLog inventoryLog : page.getList()){
+           SocialInventoryLogVo vo = new SocialInventoryLogVo();
+           BeanUtils.copyProperties(inventoryLog, vo);
+           Goods goods = goodsMapper.selectById(inventoryLog.getGoodsId());
+           vo.setName(goods.getName());
+           vo.setPackagingUnit(goods.getPackagingUnit());
+           vo.setMinPackagingUnit(goods.getMinPackagingUnit());
+           vo.setHilistCode(goods.getHilistCode());
+           voList.add(vo);
+
+       }
+        Page<SocialInventoryLogVo> resultPage = new Page<>();
+        resultPage.setList(voList);
+        resultPage.setTotal_page(page.getTotal_page());
+        resultPage.setTotal_count(page.getTotal_count());
+        return resultPage;
+    }
+
+    public Page<SocialInventoryPurchaseLogVo> get3503List(InventoryPurchaseLogQuery pLogQuery) {
+        if (pLogQuery == null) {
+            throw new MessageException("没有带查询条件");
+        }
+        QueryWrapper<InventoryPurchaseLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ne("social_type", InventorySocialTypeEnum.INITIAL_INBOUND.getType());
+        if (pLogQuery.getPageNum() == null || pLogQuery.getPageNum() == 0) {
+            pLogQuery.setPageNum(1);
+        }
+        if (pLogQuery.getPageSize() == null || pLogQuery.getPageSize() == 0) {
+            pLogQuery.setPageSize(Constants.DetailPageSize);
+        }
+        if (pLogQuery.getUploadStatus() != null && UploadStatusEnum.getByStatus(pLogQuery.getUploadStatus()) != null) {
+            queryWrapper.eq("upload_status", pLogQuery.getUploadStatus());
+        }
+        if (pLogQuery.getType() != null && InventorySocialTypeEnum.getByType(pLogQuery.getType()) != null) {
+            queryWrapper.eq("type", pLogQuery.getType());
+        }
+        Page<InventoryPurchaseLog> page = pageHelper(pLogQuery.getPageNum(), pLogQuery.getPageSize(), queryWrapper, inventoryPurchaseLogMapper, "id", false);
+        List<SocialInventoryPurchaseLogVo> voList = new ArrayList<>();
+        for (InventoryPurchaseLog inventoryPurchaseLog : page.getList()){
+            SocialInventoryPurchaseLogVo vo = new SocialInventoryPurchaseLogVo();
+            BeanUtils.copyProperties(inventoryPurchaseLog, vo);
+            Inventory inventory = inventoryMapper.selectById(inventoryPurchaseLog.getInventoryId());
+            Goods goods = goodsMapper.selectById(inventory.getGoodId());
+            vo.setName(goods.getName());
+            vo.setPackagingUnit(goods.getPackagingUnit());
+            vo.setMinPackagingUnit(goods.getMinPackagingUnit());
+            vo.setHilistCode(goods.getHilistCode());
+            voList.add(vo);
+
+        }
+        Page<SocialInventoryPurchaseLogVo> resultPage = new Page<>();
+        resultPage.setList(voList);
+        resultPage.setTotal_page(page.getTotal_page());
+        resultPage.setTotal_count(page.getTotal_count());
+        return resultPage;
+    }
+
+
+    public NotDoNumberVo getNotDoNumberDo() {
+        QueryWrapper<InventoryInit> initQuery = new QueryWrapper<>();
+        initQuery.in("upload_status", UploadStatusEnum.NoUpload.getStatus(), UploadStatusEnum.UploadFailed.getStatus());
+        long count3501 = inventoryInitMapper.selectCount(initQuery);
+
+        QueryWrapper<InventoryLog> logQuery = new QueryWrapper<>();
+        logQuery.in("upload_status", UploadStatusEnum.NoUpload.getStatus(), UploadStatusEnum.UploadFailed.getStatus());
+        long count3502 = inventoryLogMapper.selectCount(logQuery);
+
+        QueryWrapper<InventoryPurchaseLog> pLogQuery = new QueryWrapper<>();
+        pLogQuery.in("upload_status", UploadStatusEnum.NoUpload.getStatus(), UploadStatusEnum.UploadFailed.getStatus());
+
+        long count3503 = inventoryPurchaseLogMapper.selectCount(pLogQuery);
+
+//        QueryWrapper<RetailOrderInventory> rolQuery = new QueryWrapper<>();
+//        rolQuery.in("upload_status", UploadStatusEnum.NoUpload.getStatus(), UploadStatusEnum.UploadFailed.getStatus());
+//        rolQuery.in("type", RetailInventoryTypeEnum.Sale.getType(), RetailInventoryTypeEnum.Refund.getType());
+//        long count3505 = iRetailOrderInventoryService.count(rolQuery);
+        long count3505 = 0;
+        NotDoNumberVo notDoNumberVo = new NotDoNumberVo();
+        notDoNumberVo.setNumber3501(count3501);
+        notDoNumberVo.setNumber3502(count3502);
+        notDoNumberVo.setNumber3503(count3503);
+        notDoNumberVo.setNumber3505(count3505);
+        notDoNumberVo.setTotalNumber(count3501 + count3502 + count3503 + count3505);
+        return notDoNumberVo;
+    }
+
+    public boolean upload3501() {
+        QueryWrapper<InventoryInit> initQuery = new QueryWrapper<>();
+        initQuery.in("upload_status", UploadStatusEnum.NoUpload.getStatus(), UploadStatusEnum.UploadFailed.getStatus());
+        initQuery.orderByAsc("id");
+        initQuery.last("limit 1");
+        InventoryInit curUploadData = inventoryInitMapper.selectOne(initQuery);
+        if (curUploadData == null) {
+            return false;
+        }
+
+        Goods goods = goodsMapper.selectById(curUploadData.getGoodsId());
+        Inventory inventory = inventoryMapper.selectById(curUploadData.getInventoryId());
+        SocialDirectory socialDirectory = socialDirectoryMapper.getByCode(goods.getHilistCode());
+        BigDecimal number = new BigDecimal(curUploadData.getWholeNumber());
+        if (goods.getTrdnFlag()) {
+            number = number
+                    .multiply(new BigDecimal(goods.getMinPackagingNumber()))
+                    .add(new BigDecimal(curUploadData.getFragmentNumber()));
+        }
+        JSONObject jsonObject = JSONObject.parseObject(socialDirectory.getData());
+        String jsonRxFlag = (String) jsonObject.get("rx_flag");
+        String rxFlag = jsonRxFlag == null||jsonRxFlag.isEmpty() ?  "0" : jsonRxFlag;
+        IM3501 im3501 = new IM3501();
+        im3501.setMedListCodg(socialDirectory.getCode())
+                .setMedListCodg(socialDirectory.getCode())
+                .setFixmedinsHilistId(String.valueOf(socialDirectory.getId()))
+                .setFixmedinsHilistName(goods.getName())
+                .setFixmedinsBchno(String.valueOf(inventory.getId()))
+                .setInvdate(curUploadData.getCreateDate())
+                .setInvCnt(number)
+                .setManuDate(inventory.getProductionDate())
+                .setExpyEnd(inventory.getExpiryDate())
+                .setRxFlag(rxFlag);
+
+        socialRequest.call3501(im3501);
+        InventoryInit updateInit = new InventoryInit();
+        updateInit.setId(curUploadData.getId());
+        updateInit.setUploadStatus(UploadStatusEnum.Uploaded.getStatus());
+        updateInit.setUploadDatetime(LocalDateTime.now());
+        inventoryInitMapper.updateById(updateInit);
+        return true;
+    }
+
+
+    public boolean upload3502() {
+        QueryWrapper<InventoryLog> logQuery = new QueryWrapper<>();
+        logQuery.in("upload_status", UploadStatusEnum.NoUpload.getStatus(), UploadStatusEnum.UploadFailed.getStatus());
+        logQuery.orderByAsc("id");
+        logQuery.last("limit 1");
+        InventoryLog curInventoryLog = inventoryLogMapper.selectOne(logQuery);
+        if (curInventoryLog == null) {
+            return false;
+        }
+        Inventory inventory = inventoryMapper.selectById(curInventoryLog.getInventoryId());
+        Goods goods = goodsMapper.selectById(inventory.getGoodId());
+        SocialDirectory socialDirectory = socialDirectoryMapper.getByCode(goods.getHilistCode());
+        IM3502 im3502 = new IM3502();
+        JSONObject jsonObject = JSONObject.parseObject(socialDirectory.getData());
+        String jsonRxFlag = (String) jsonObject.get("rx_flag");
+        String rxFlag = jsonRxFlag == null||jsonRxFlag.isEmpty() ?  "0" : jsonRxFlag;
+
+
+        im3502.setMedListCodg(socialDirectory.getCode())
+                .setInvChgType(String.valueOf(curInventoryLog.getSocialType()))
+                .setFixmedinsHilistId(String.valueOf(socialDirectory.getId()))
+                .setFixmedinsHilistName(goods.getName())
+                .setFixmedinsBchno(String.valueOf(inventory.getId()))
+                .setRxFlag(rxFlag)
+                .setInvChgTime(curInventoryLog.getCreateTime())
+                .setTrdnFlag(goods.getTrdnFlag() ? "1" : "0");
+
+        BigDecimal number = new BigDecimal(curInventoryLog.getChangeWholeNumber());
+        BigDecimal price = goods.getUnitPrice();
+        if (goods.getTrdnFlag()) {
+            number = number
+                    .multiply(new BigDecimal(goods.getMinPackagingNumber())).
+                    add(new BigDecimal(curInventoryLog.getChangeFragmentNumber()));
+            price = goods.getDisassemblyPrice();
+        }
+        im3502.setPric(price);
+        im3502.setCnt(number);
+        socialRequest.call3502(im3502);
+        InventoryLog updateInventoryLog = new InventoryLog();
+        updateInventoryLog.setId(curInventoryLog.getId());
+        updateInventoryLog.setUploadStatus(UploadStatusEnum.Uploaded.getStatus());
+        updateInventoryLog.setUploadDatetime(LocalDateTime.now());
+        inventoryLogMapper.updateById(updateInventoryLog);
+        return true;
+    }
+
+
+    public boolean upload3503() {
+        QueryWrapper<InventoryPurchaseLog> logQuery = new QueryWrapper<>();
+        logQuery.in("upload_status", UploadStatusEnum.NoUpload.getStatus(), UploadStatusEnum.UploadFailed.getStatus());
+        logQuery.orderByAsc("id");
+        logQuery.last("limit 1");
+        InventoryPurchaseLog curInventoryPurchaseLog = inventoryPurchaseLogMapper.selectOne(logQuery);
+        if (curInventoryPurchaseLog == null) {
+            return false;
+        }
+        InventoryPurchase inventoryPurchase = inventoryPurchaseMapper.getByCode(curInventoryPurchaseLog.getInventoryPurchaseCode());
+        Inventory inventory = inventoryMapper.selectById(curInventoryPurchaseLog.getInventoryId());
+        Goods goods = goodsMapper.selectById(inventory.getGoodId());
+        SocialDirectory socialDirectory = socialDirectoryMapper.getByCode(goods.getHilistCode());
+        InventorySupplier inventorySupplier = inventorySupplierMapper.selectById(inventoryPurchase.getSupplierId());
+        ManagerUser managerUser = getManagerUser();
+
+
+        BigDecimal number = new BigDecimal(curInventoryPurchaseLog.getNumber());
+        if (goods.getTrdnFlag()) {
+            number = number
+                    .multiply(new BigDecimal(goods.getMinPackagingNumber()));
+        }
+        JSONObject jsonObject = JSONObject.parseObject(socialDirectory.getData());
+        String jsonRxFlag = (String) jsonObject.get("rx_flag");
+        String rxFlag = jsonRxFlag == null||jsonRxFlag.isEmpty() ?  "0" : jsonRxFlag;
+
+
+        if (curInventoryPurchaseLog.getSocialType().equals(InventorySocialTypeEnum.OTHER_INBOUND.getType())) {
+            IM3503 im3503 = new IM3503();
+            im3503.setPurcRetnCnt(number)
+                    .setMedListCodg(socialDirectory.getCode())
+                    .setFixmedinsHilistId(String.valueOf(socialDirectory.getId()))
+                    .setFixmedinsHilistName(goods.getName())
+                    .setFixmedinsBchno(String.valueOf(inventory.getId()))
+                    .setSplerName(inventorySupplier.getName())
+                    .setManuLotnum(inventory.getProductionBatchCode())
+                    .setProdentpName(goods.getProducer() == null||goods.getProducer().isEmpty() ? "-":goods.getProducer())
+                    .setAprvno(goods.getApprovalCode() ==null||goods.getApprovalCode().isEmpty()?"-":goods.getApprovalCode())
+                    .setManuDate(inventory.getProductionDate())
+                    .setExpyEnd(inventory.getExpiryDate())
+                    .setPurcInvoCodg(inventoryPurchase.getInvoiceCode())
+                    .setPurcInvoNo(inventoryPurchase.getInvoiceCode())
+                    .setPurcRetnStoinTime(inventoryPurchase.getCreateDatetime())
+                    .setPurcRetnOpterName(managerUser.getName())
+                    .setRxFlag(rxFlag);
+            socialRequest.call3503(im3503);
+        }
+        if (curInventoryPurchaseLog.getSocialType().equals(InventorySocialTypeEnum.OTHER_OUTBOUND.getType())) {
+            IM3504 im3504 = new IM3504();
+            im3504.setPurcRetnCnt(number)
+                    .setMedListCodg(socialDirectory.getCode())
+                    .setFixmedinsHilistId(String.valueOf(socialDirectory.getId()))
+                    .setFixmedinsHilistName(goods.getName())
+                    .setFixmedinsBchno(String.valueOf(inventory.getId()))
+                    .setSplerName(inventorySupplier.getName())
+                    .setManuDate(inventory.getProductionDate())
+                    .setExpyEnd(inventory.getExpiryDate())
+                    .setPurcInvoCodg(inventoryPurchase.getInvoiceCode())
+                    .setPurcInvoNo(inventoryPurchase.getInvoiceCode())
+                    .setPurcRetnStoinTime(inventoryPurchase.getCreateDatetime())
+                    .setPurcRetnOpterName(managerUser.getName())
+                    .setPurcInvoCodg(inventoryPurchase.getInvoiceCode())
+                    .setRxFlag(rxFlag);
+            socialRequest.call3504(im3504);
+        }
+        InventoryPurchaseLog updateIPLog = new InventoryPurchaseLog();
+        updateIPLog.setId(curInventoryPurchaseLog.getId());
+        updateIPLog.setUploadStatus(UploadStatusEnum.Uploaded.getStatus());
+        updateIPLog.setUploadDatetime(LocalDateTime.now());
+        inventoryPurchaseLogMapper.updateById(updateIPLog);
+        return true;
+    }
+
+//    public boolean upload3505() {
+//        QueryWrapper<RetailOrderInventory> roQuery = new QueryWrapper<>();
+//        roQuery.in("upload_status", UploadStatusEnum.NoUpload.getStatus(), UploadStatusEnum.UploadFailed.getStatus());
+//        roQuery.in("type", RetailInventoryTypeEnum.Sale.getType(), RetailInventoryTypeEnum.Refund.getType());
+//        roQuery.orderByAsc("id");
+//        roQuery.last("limit 1");
+//        RetailOrderInventory orderInventory = iRetailOrderInventoryService.getOne(roQuery);
+//        if (orderInventory == null) {
+//            return false;
+//        }
+//        Inventory inventory = iInventoryService.getById(orderInventory.getInventoryId());
+//
+//        RetailOrder retailOrder = iRetailOrderService.getOne(new QueryWrapper<RetailOrder>()
+//                .eq("code", orderInventory.getRetailOrderCode()));
+//        ManagerUser docker  =iManagerUserService.getById(retailOrder.getDockerId());
+//        ManagerUser salePerson = iManagerUserService.getById(retailOrder.getSalePersonId());
+//        Goods goods = iGoodsService.getById(inventory.getGoodId());
+//        SocialDirectory socialDirectory = iSocialDirectoryService.getByCode(goods.getHilistCode());
+//        JSONObject jsonObject = JSONObject.parseObject(socialDirectory.getData());
+//        String jsonRxFlag = (String) jsonObject.get("rx_flag");
+//        String rxFlag = jsonRxFlag == null||jsonRxFlag.isEmpty() ?  "0" : jsonRxFlag;
+//
+//        if (orderInventory.getType().equals(RetailInventoryTypeEnum.Sale.getType())){
+//            //销售 走3505
+//            IM3505 im3505 = new IM3505();
+//            IM3505.SelInfo selInfo = new IM3505.SelInfo();
+//            selInfo.setMed_list_codg(goods.getHilistCode());
+//            selInfo.setFixmedins_hilist_id(String.valueOf(socialDirectory.getId()));
+//            selInfo.setFixmedins_hilist_name(goods.getName());
+//            selInfo.setFixmedins_bchno(String.valueOf(orderInventory.getInventoryId()));
+//            selInfo.setPrsc_dr_name(docker.getName());
+//            selInfo.setPhar_name(docker.getName());
+//            selInfo.setPhar_prac_cert_no(docker.getDockerCertno());
+//
+//            if (retailOrder.getPayType().equals(RetailOrderPayTypeEnum.MEDICARE.getCode())){
+//                //医保支付
+//                RetailSocialPayLog payLog = iRetailSocialPayLogService.getOne(new QueryWrapper<RetailSocialPayLog>().
+//                        eq("retail_order_code", orderInventory.getRetailOrderCode()));
+//                selInfo.setSetl_id(payLog.getSetlId());
+//                selInfo.setMdtrt_sn(payLog.getMdtrtId());
+//                selInfo.setPsn_no(payLog.getPsnNo());
+//                selInfo.setPsn_name(payLog.getName());
+//                selInfo.setCertno(payLog.getCertno());
+//                selInfo.setMdtrt_setl_type("1");
+//
+//            }else {
+//                selInfo.setMdtrt_sn(orderInventory.getFeedetlSn());
+//                selInfo.setMdtrt_setl_type("2");
+//            }
+//            selInfo.setManu_lotnum(inventory.getProductionBatchCode());
+//            selInfo.setManu_date(inventory.getProductionDate());
+//            selInfo.setExpy_end(inventory.getExpiryDate());
+//            selInfo.setRx_flag(rxFlag);
+//            selInfo.setTrdn_flag(orderInventory.getTrdnFlag()?"0":"1");
+//            selInfo.setRtal_docno(orderInventory.getRetailOrderCode());
+//            selInfo.setSel_retn_time(orderInventory.getCreateTime());
+//            selInfo.setSel_retn_cnt(BigDecimal.valueOf(orderInventory.getNumber()));
+//            selInfo.setSel_retn_opter_name(salePerson.getName());
+//            List<String> drugtracinfo = new ArrayList<>();
+//            selInfo.setDrugtracinfo(drugtracinfo);
+//            im3505.setSelinfo(selInfo);
+//            socialRequest.call3505(im3505);
+//        }
+//
+//        if (orderInventory.getType().equals(RetailInventoryTypeEnum.Refund.getType())){
+//            //退款 走3506
+//            IM3506 im3506 = new IM3506();
+//            IM3506.SelInfo selInfo = new IM3506.SelInfo();
+//            selInfo.setMed_list_codg(goods.getHilistCode());
+//            selInfo.setFixmedins_hilist_id(String.valueOf(socialDirectory.getId()));
+//            selInfo.setFixmedins_hilist_name(goods.getName());
+//            selInfo.setFixmedins_bchno(String.valueOf(orderInventory.getInventoryId()));
+//            selInfo.setPrsc_dr_name(docker.getName());
+//            selInfo.setPhar_name(docker.getName());
+//            selInfo.setPhar_prac_cert_no(docker.getDockerCertno());
+//
+//            if (retailOrder.getPayType().equals(RetailOrderPayTypeEnum.MEDICARE.getCode())){
+//                //医保支付
+//                RetailSocialPayLog payLog = iRetailSocialPayLogService.getOne(new QueryWrapper<RetailSocialPayLog>().
+//                        eq("retail_order_code", orderInventory.getRetailOrderCode()));
+//                selInfo.setSetl_id(payLog.getSetlId());
+//                selInfo.setMdtrt_sn(payLog.getMdtrtId());
+//                selInfo.setPsn_no(payLog.getPsnNo());
+//                selInfo.setPsn_name(payLog.getName());
+//                selInfo.setCertno(payLog.getCertno());
+//                selInfo.setMdtrt_setl_type("1");
+//
+//            }else {
+//                selInfo.setMdtrt_sn(orderInventory.getFeedetlSn());
+//                selInfo.setMdtrt_setl_type("2");
+//            }
+//            selInfo.setManu_lotnum(inventory.getProductionBatchCode());
+//            selInfo.setManu_date(inventory.getProductionDate());
+//            selInfo.setExpy_end(inventory.getExpiryDate());
+//            selInfo.setRx_flag(rxFlag);
+//            selInfo.setTrdn_flag(orderInventory.getTrdnFlag()?"0":"1");
+//            selInfo.setRtal_docno(orderInventory.getRetailOrderCode());
+//            selInfo.setSel_retn_time(orderInventory.getCreateTime());
+//            selInfo.setSel_retn_cnt(BigDecimal.valueOf(orderInventory.getNumber()));
+//            selInfo.setSel_retn_opter_name(salePerson.getName());
+//            List<String> drugtracinfo = new ArrayList<>();
+//            selInfo.setDrugtracinfo(drugtracinfo);
+//            im3506.setSelinfo(selInfo);
+//            socialRequest.call3506(im3506);
+//        }
+//        RetailOrderInventory updateOrderInventory = new RetailOrderInventory();
+//        updateOrderInventory.setId(orderInventory.getId());
+//        updateOrderInventory.setUploadStatus(UploadStatusEnum.Uploaded.getStatus());
+//        updateOrderInventory.setCreateTime(LocalDateTime.now());
+//        iRetailOrderInventoryService.updateById(updateOrderInventory);
+//        return true;
+//    }
+
 }
diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialUserService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialUserService.java
index 1f03c72..92dcb59 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialUserService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialUserService.java
@@ -5,7 +5,6 @@ import com.syjiaer.clinic.server.common.api.input.IM1101;
 import com.syjiaer.clinic.server.common.api.output.OM1101;
 import com.syjiaer.clinic.server.common.api.request.SocialRequest;
 import com.syjiaer.clinic.server.common.exception.MessageException;
-import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.entity.social.SocialUser;
 import com.syjiaer.clinic.server.mapper.social.SocialUserMapper;
 import org.springframework.beans.BeanUtils;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f690eb9..4a52d88 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -18,7 +18,7 @@ spring:
   config:
     import: optional:classpath:developer-config.yml
 server:
-  port: 8080
+  port: 8088
 common:
   isdev: true
 jwt:
diff --git a/src/main/resources/xml/SocialDirectoryMapper.xml b/src/main/resources/xml/SocialDirectoryMapper.xml
index ce49015..b0705d0 100644
--- a/src/main/resources/xml/SocialDirectoryMapper.xml
+++ b/src/main/resources/xml/SocialDirectoryMapper.xml
@@ -4,7 +4,7 @@
 
 
     <select id="selectSocialDirectoryView"
-            resultType="com.syjiaer.clinic.server.entity.social.dto.SocialDirectoryView">
+            resultType="com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView">
         SELECT social_directory.id,
                social_directory.code,
                social_directory.name,
diff --git a/src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java b/src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java
index 3ba3afc..81b0247 100644
--- a/src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java
+++ b/src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java
@@ -1,9 +1,5 @@
 package com.syjiaer.clinic.server;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.syjiaer.clinic.server.common.vo.Page;
-import com.syjiaer.clinic.server.entity.social.dto.SocialDirectoryView;
-import com.syjiaer.clinic.server.mapper.social.SocialDirectoryMapper;
 import com.syjiaer.clinic.server.service.social.SocialDirectoryService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;