From 7e698fc72092917284e62050a57f08ad4badc523 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 6 Sep 2024 16:30:25 +0800
Subject: [PATCH] =?UTF-8?q?9/6=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/auth/SysWorkplaceController.java | 8 ++++++++
 .../java/com/glxp/api/req/auth/SysWorkplaceRequest.java  | 3 +++
 .../com/glxp/api/service/basic/UdiContrastService.java   | 4 ++--
 .../resources/mybatis/mapper/auth/SysWorkplaceDao.xml    | 6 ++++++
 .../resources/mybatis/mapper/thrsys/ThrProductsDao.xml   | 9 ++++++++-
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java
index 04d8d0f48..1003e9f28 100644
--- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java
+++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java
@@ -106,6 +106,14 @@ public class SysWorkplaceController extends BaseController {
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/sysWorkplace/page/filterOptimize")
     public BaseResponse filterOptimize(SysWorkplaceRequest request) {
+        if(request != null && request.getUserIdFlag()){
+            Long userId = getUserId();
+            List<UserWorkResponse> userWorkPlaceList = basicCollectUserService.getUserWorkPlaceList(userId);
+            List<Long> collect = userWorkPlaceList.stream().map(UserWorkResponse::getWorkplaceId).collect(Collectors.toList());
+            if (CollUtil.isNotEmpty(collect)){
+                request.setWorkPlaceIds(collect);
+            }
+        }
         List<SysWorkplaceResponse> page = sysWorkplaceService.filterList(request);
         List<DictDto> reList = page.stream().map(s -> {
             DictDto dictDto = new DictDto(s.getWorkplaceId() + "", s.getWorkplaceName());
diff --git a/src/main/java/com/glxp/api/req/auth/SysWorkplaceRequest.java b/src/main/java/com/glxp/api/req/auth/SysWorkplaceRequest.java
index 41e54e8e8..f5887fa9b 100644
--- a/src/main/java/com/glxp/api/req/auth/SysWorkplaceRequest.java
+++ b/src/main/java/com/glxp/api/req/auth/SysWorkplaceRequest.java
@@ -24,8 +24,11 @@ public class SysWorkplaceRequest extends ListPageRequest {
 
     private List<Long> ids;
 
+    private List<Long> workPlaceIds;
 
     private String chargeUser;
 
+    private Boolean userIdFlag;
+
 
 }
diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
index ec6c42ee6..f01eec985 100644
--- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
+++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
@@ -288,8 +288,8 @@ public class UdiContrastService {
                     BeanUtils.copyProperties(thrProductsEntity, udiProductEntity);
                     udiProductEntity.setId(IdUtil.getSnowflakeNextId());
                     udiProductEntity.setNameCode(basicInsDrug.getTradeName());
-                    udiProductEntity.setBzgg(basicInsDrug.getPackagingSpec() != null  ? basicInsDrug.getPackagingSpec() :basicInsDrugEntity.getPackagingSpec());
-                    udiProductEntity.setPrepnSpec(basicInsDrug.getPrepnSpec() != null  ? basicInsDrug.getPrepnSpec() :basicInsDrugEntity.getPrepnSpec());
+                    udiProductEntity.setPrepnSpec(basicInsDrug.getPackagingSpec() != null  ? basicInsDrug.getPackagingSpec() :basicInsDrugEntity.getPackagingSpec());
+//                    udiProductEntity.setPrepnSpec(basicInsDrug.getPrepnSpec() != null  ? basicInsDrug.getPrepnSpec() :basicInsDrugEntity.getPrepnSpec());
                     udiProductEntity.setZczbhhzbapzbh(basicInsDrug.getApprovalNum() != null  ? basicInsDrug.getApprovalNum() :basicInsDrugEntity.getApprovalNum());
                     udiProductEntity.setCpmctymc(thrProductsEntity.getName());
                     if (basicInsDrugEntity.getInsuranceDrugClass() != null){
diff --git a/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml b/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml
index daed69220..bf966008c 100644
--- a/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml
@@ -36,6 +36,12 @@
             <if test=" request.code != null and request.code != ''">
                 AND scps.code = #{request.code}
             </if>
+            <if test=" request.workPlaceIds != null and request.workPlaceIds.size > 0">
+                AND sw.workplaceId IN
+                <foreach collection="request.workPlaceIds" item="workplaceId" index="index" open="(" close=")" separator=",">
+                    #{workplaceId}
+                </foreach>
+            </if>
         </where>
         ORDER BY sw.workplaceId
     </select>
diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
index 2f573e297..ba5a25a49 100644
--- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
+++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
@@ -124,8 +124,15 @@
             <if test="manufactory != '' and manufactory != null">
                 AND manufactory LIKE concat('%', #{manufactory}, '%')
             </if>
+<!--            <if test="spec != '' and spec != null">-->
+<!--                AND spec LIKE concat('%', #{spec}, '%')-->
+<!--            </if>-->
             <if test="spec != '' and spec != null">
-                AND spec LIKE concat('%', #{spec}, '%')
+                AND (
+                spec like concat('%', #{spec}, '%')
+                or prepnSpec like concat('%', #{spec}, '%')
+                or prepnUnit like concat('%', #{spec}, '%')
+                )
             </if>
             <if test="unionCode != '' and unionCode != null">
                 or code LIKE concat('%', #{unionCode}, '%')