From 07390e2fcb4adf27c928335bf27ae7939c5a80ad Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 23 五月 2023 11:28:12 +0800
Subject: [PATCH] bakcup20230523

---
 force-app/main/default/classes/LexSummonsCreatController.cls |  517 ++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 381 insertions(+), 136 deletions(-)

diff --git a/force-app/main/default/classes/LexSummonsCreatController.cls b/force-app/main/default/classes/LexSummonsCreatController.cls
index bc47bb8..f83dc7a 100644
--- a/force-app/main/default/classes/LexSummonsCreatController.cls
+++ b/force-app/main/default/classes/LexSummonsCreatController.cls
@@ -105,31 +105,42 @@
     public static Boolean EditDelCommitBtnDisabled { get; private set; }
     public static Boolean saveBtnDisabled { get; private set; }
     public static Boolean SorderBtnDisabled { get; private set; }
+
+    // page
+    public static Integer pagesize { get; set; }
+    public static Integer pageToken { get; set; }
+    //public static String sortField { get; set; }
+    //public static String sortOrder { get; set; }
+    public static Integer totalcount { get; set; }
+    public static Integer addSize { get; set; }
+    //List<ConsumableorderdetailsInfoLwc> reSetLwc
+    public static List<ConsumableorderdetailsInfo> addData { get; set; }
+    public static Map<String, String> skipData { get; set; }
     // 淇濆瓨鍚庡姩浣滐細 1.妫�绱� 2.鎺掑簭
-    public static String sortKey { get; set; }
-    public static String preSortKey { get; private set; }
-    public static Boolean sortOrderAsc { get; private set; }
-    public static String[] sortOrder { get; private set; }
-    private static String[] columus = new List<String>{
-        'Consumable_Product__r.Name',
-        'Consumable_Product__r.Asset_Model_No__c',
-        'Consumable_Product__r.Intra_Trade_List_RMB__c',
-        '',
-        '',
-        'Consumable_Product__r.Category3__c',
-        'Consumable_Product__r.Category4__c',
-        'Consumable_Product__r.Category5__c'
-    };
-    private static String[] columus_no = new List<String>{
-        'Product2__c.Name',
-        'Product2__c.Asset_Model_No__c',
-        'Product2__c.Intra_Trade_List_RMB__c',
-        '',
-        '',
-        'Category3__c',
-        'Category4__c',
-        'Category5__c'
-    };
+    // public static String sortKey { get; set; }
+    // public static String preSortKey { get; private set; }
+    // public static Boolean sortOrderAsc { get; private set; }
+    // public static String[] sortOrder { get; private set; }
+    // private static String[] columus = new List<String>{
+    //     'Consumable_Product__r.Name',
+    //     'Consumable_Product__r.Asset_Model_No__c',
+    //     'Consumable_Product__r.Intra_Trade_List_RMB__c',
+    //     '',
+    //     '',
+    //     'Consumable_Product__r.Category3__c',
+    //     'Consumable_Product__r.Category4__c',
+    //     'Consumable_Product__r.Category5__c'
+    // };
+    // private static String[] columus_no = new List<String>{
+    //     'Product2__c.Name',
+    //     'Product2__c.Asset_Model_No__c',
+    //     'Product2__c.Intra_Trade_List_RMB__c',
+    //     '',
+    //     '',
+    //     'Category3__c',
+    //     'Category4__c',
+    //     'Category5__c'
+    // };
 
     //鍒拌揣鍗曟槑缁�1
     private static List<Consumable_Orderdetails__c> consumableorderdetailsSelected = new List<Consumable_Orderdetails__c>();
@@ -234,7 +245,7 @@
 
     // 鐢婚潰鍒濆鍖�
     @AuraEnabled
-    public static ResponseBodyLWC init(String ESetidJs,String statusEdit) {
+    public static ResponseBodyLWC init(String ESetidJs, String statusEdit, Integer pageSizeLWC, Integer pageTokenLWC) {
         // try {
         firstInit(ESetidJs);
         statusEdit = statusEdit;
@@ -245,12 +256,18 @@
         ResponseBodyLWC res = new ResponseBodyLWC();
         Map<String, object> data = new Map<String, object>();
         res.entity = data;
+        // public static Integer pagesize { get; set; }
+        // public static Integer pageToken { get; set; }
+        // public static String sortField { get; set; }
+        // public static String sortOrder { get; set; }
+        pagesize = pageSizeLWC;
+        pageToken = pageTokenLWC > 2000 ? 2000 : pageTokenLWC;
 
-        sortKey = '1';
-        preSortKey = '1';
-        sortOrderAsc = false;
-        sortOrder = new List<String>(8);
-        sortOrder = new List<String>{ ' ', ' ', ' ', ' ', '鈫�', '', '', '' };
+        // sortKey = '1';
+        // preSortKey = '1';
+        // sortOrderAsc = false;
+        // sortOrder = new List<String>(8);
+        // sortOrder = new List<String>{ ' ', ' ', ' ', ' ', '鈫�', '', '', '' };
         //cate1ForSort = '';
         sumPrice = 0;
         IdCheck = EsetId;
@@ -326,6 +343,9 @@
         for (AggregateResult orderdetail : orderdetailCount) {
             zaikuId.add(String.valueOf(orderdetail.get('cpc')));
         }
+        System.debug('sqlagencyProType = ' + sqlagencyProType);
+        System.debug('userWorkLocation = ' + userWorkLocation);
+        System.debug('accountName = ' + accountName);
         List<Consumable_order_details2__c> CountDel = [
             SELECT
                 Id,
@@ -359,8 +379,8 @@
             SummonsFlag = 'hidden';
             String msoql = makeSoqlinventory();
             initStandardController(msoql);
+            System.debug('msoql = ' + msoql);
             product2Selected = Database.query(msoql);
-            //product2Selected = product2s();
             if (String.isBlank(arriveorder)) {
                 EditDelCommitBtnDisabled = true;
                 for (Integer i = 0; i < product2Selected.size(); i++) {
@@ -414,6 +434,7 @@
                             MidMap2.put(CountDel[i].Consumable_Product__c + str, Jstage);
                         }
                     }
+                    System.debug('MidMap2.size() = ' + MidMap2.size());
                     /*//鐒跺悗寰幆CountDel鍘讳慨鏀筸ap閲岀殑allnumber
                         if(MidMap.containsKey(CountDel[i].Consumable_Product__c)){
                             ConsumableorderdetailsInfo Jstage = MidMap.get(CountDel[i].Consumable_Product__c);
@@ -450,7 +471,7 @@
 
                 Integer ishosnum = 0;
                 for (ConsumableorderdetailsInfo ass : consumableorderdetailsSelectRecords) {
-                    ass.sortBy = sortOrderAsc;
+                    //ass.sortBy = sortOrderAsc;
                     //add by rentx 2021-3-10
                     if (ass.hospitalSpecialOffer) {
                         ishosnum = ishosnum + 1;
@@ -641,7 +662,7 @@
 
                 Integer ishosnum = 0;
                 for (ConsumableorderdetailsInfo ass : consumableorderdetailsSelectRecords) {
-                    ass.sortBy = sortOrderAsc;
+                    //ass.sortBy = sortOrderAsc;
                     for (Consumable_Orderdetails__c cdc1 : consumableorderdetailsSelected) {
                         cdc1.Shipment_Count__c = cdc1.Consumable_count__c;
                         if (ass.prod.Id == cdc1.Consumable_Product__c) {
@@ -720,6 +741,8 @@
                     AND Invoice_status__c != '鑽夋涓�'
             ];
 
+            System.debug('coc ESetId = ' + ESetId);
+            System.debug('coc userWorkLocation = ' + userWorkLocation);
             coc = [
                 SELECT
                     Id,
@@ -756,7 +779,7 @@
             // 鍒拌揣璁㈠崟鏉ョ殑鏃跺��
             if (getExistarrive()) {
                 if (editAble) {
-                    alertMessage = '鍒拌揣璁㈠崟鐩存帴鍑哄簱锛屽嚭搴撳崟鏄庣粏涓嶅彲缂栬緫銆�';
+                    alertMessage = '鍒拌揣璁㈠崟鐩存帴鍑哄簱锛屽嚭搴撳崟鏄庣粏涓嶅彲缂栬緫';
                 }
                 if (coc.SummonsStatus_c__c == '宸叉彁浜�' || coc.SummonsStatus_c__c == '鎵瑰噯') {
                     system.debug('coc.SummonsStatus_c__c : ' + coc.SummonsStatus_c__c);
@@ -1173,7 +1196,7 @@
                 // return null;
                 Integer ishosnum = 0;
                 for (ConsumableorderdetailsInfo ass : consumableorderdetailsSelectRecords) {
-                    ass.sortBy = sortOrderAsc;
+                    //ass.sortBy = sortOrderAsc;
                     for (Consumable_Orderdetails__c cdc1 : consumableorderdetailsSelected) {
                         //update by rentx 2012-3-1 start
                         // if(ass.prod.Id == cdc1.Consumable_Product__c){
@@ -1311,10 +1334,38 @@
         category5OptionMap = new Map<String, String>();
         category5OptionMap.put('', '-鏃�-');
 
+        //鍒嗛〉
+        PaginatedAccounts paginatedAccounts = new PaginatedAccounts();
+        totalCount = pageRecords.size();
+        System.debug('pageToken = ' + pageToken);
+        System.debug('pageSize = ' + pageSize);
+        System.debug('totalCount = ' + totalCount);
+        paginatedAccounts.nextPageToken = (pageToken + pageSize < totalCount) ? pageToken + pageSize : null;
+        System.debug('paginatedAccounts.nextPageToken = ' + paginatedAccounts.nextPageToken);
+        paginatedAccounts.recordStart = pageToken + 1;
+        paginatedAccounts.pageNumber = pageToken / pageSize + 1;
+        Integer recordEnd = pageSize * paginatedAccounts.pageNumber;
+        paginatedAccounts.recordEnd = totalCount >= recordEnd ? recordEnd : totalCount;
+        paginatedAccounts.totalRecords = totalCount;
+
+        Integer startIdx;
+        Integer endIdx;
+        startIdx = pageToken;
+        endIdx = pageToken + pageSize;
+        List<ConsumableorderdetailsInfo> pageRecordsTemp = new List<ConsumableorderdetailsInfo>();
+        if (endIdx > pageRecords.size()) {
+            endIdx = pageRecords.size();
+        }
+        for (Integer i = startIdx; i < endIdx; i++) {
+            pageRecordsTemp.add(pageRecords.get(i));
+        }
+
         Boolean Existarrive = (coc.Arrive_Order__c != null);
         String ConsumableOut_report = System.Label.ConsumableOut_report;
         System.debug('consumableproductdetailsRecords = ' + consumableproductdetailsRecords);
-        data.put('ConsumableOut_report', 'ConsumableOut_report');
+
+        data.put('paginatedAccounts', paginatedAccounts);
+        data.put('ConsumableOut_report', ConsumableOut_report);
         data.put('accountid', accountid);
         data.put('consumableproductdetailsRecords', consumableproductdetailsRecords);
         data.put('agencyProType', agencyProType);
@@ -1333,7 +1384,7 @@
         data.put('EditDelCommitBtnDisabled', EditDelCommitBtnDisabled);
         data.put('EditAble', EditAble);
         data.put('coc', coc);
-        data.put('pageRecords', pageRecords);
+        data.put('pageRecords', pageRecordsTemp);
         data.put('arriveorder', arriveorder);
         data.put('consumableorderdetails2Count', consumableorderdetails2Count);
         data.put('consumableorderdetails2Records', consumableorderdetails2Records);
@@ -1362,7 +1413,7 @@
         ];
         category4OptionList = new List<SelectOption>();
         category4OptionList.add(new SelectOption('', '-鏃�-'));
-        category4OptionMap = new Map<String,String>();
+        category4OptionMap = new Map<String, String>();
         category4OptionMap.put('', '-鏃�-');
         for (AggregateResult category4Search : category4List) {
             String deliverycnt4 = String.valueOf(category4Search.get('c4c'));
@@ -1379,15 +1430,15 @@
 
         category5OptionList = new List<SelectOption>();
         category5OptionList.add(new SelectOption('', '-鏃�-'));
-        category5OptionMap = new Map<String,String>();
+        category5OptionMap = new Map<String, String>();
         category5OptionMap.put('', '-鏃�-');
         for (AggregateResult category5Search : category5List) {
             String deliverycnt5 = String.valueOf(category5Search.get('c5c'));
             category5OptionList.add(new SelectOption(deliverycnt5, deliverycnt5));
             category5OptionMap.put(deliverycnt5, deliverycnt5);
         }
-        data.put('category4OptionMap',category4OptionMap);
-        data.put('category5OptionMap',category5OptionMap);
+        data.put('category4OptionMap', category4OptionMap);
+        data.put('category5OptionMap', category5OptionMap);
         res.status = 'Success';
         res.code = 200;
         System.debug('res = ' + res);
@@ -1395,7 +1446,7 @@
     }
 
     @AuraEnabled
-    public static ResponseBodyLWC categoryload(String category3Lwc,String category4Lwc) {
+    public static ResponseBodyLWC categoryload(String category3Lwc, String category4Lwc) {
         ResponseBodyLWC res = new ResponseBodyLWC();
         Map<String, object> data = new Map<String, object>();
         res.entity = data;
@@ -1410,7 +1461,7 @@
         ];
         category4OptionList = new List<SelectOption>();
         category4OptionList.add(new SelectOption('', '-鏃�-'));
-        category4OptionMap = new Map<String,String>();
+        category4OptionMap = new Map<String, String>();
         category4OptionMap.put('', '-鏃�-');
         for (AggregateResult category4Search : category4List) {
             String deliverycnt4 = String.valueOf(category4Search.get('c4c'));
@@ -1427,15 +1478,15 @@
 
         category5OptionList = new List<SelectOption>();
         category5OptionList.add(new SelectOption('', '-鏃�-'));
-        category5OptionMap = new Map<String,String>();
+        category5OptionMap = new Map<String, String>();
         category5OptionMap.put('', '-鏃�-');
         for (AggregateResult category5Search : category5List) {
             String deliverycnt5 = String.valueOf(category5Search.get('c5c'));
             category5OptionList.add(new SelectOption(deliverycnt5, deliverycnt5));
             category5OptionMap.put(deliverycnt5, deliverycnt5);
         }
-        data.put('category4OptionMap',category4OptionMap);
-        data.put('category5OptionMap',category5OptionMap);
+        data.put('category4OptionMap', category4OptionMap);
+        data.put('category5OptionMap', category5OptionMap);
         res.status = 'Success';
         res.code = 200;
         System.debug('res = ' + res);
@@ -1456,7 +1507,9 @@
         Boolean editAbleLwc,
         List<ConsumableorderdetailsInfoLwc> pageRecordsLwcLwc,
         List<ConsumableorderdetailsInfo> consumableproductdetailsRecordsLwc,
-        String arriveorderLwc
+        String arriveorderLwc,
+        Integer pageSizeLWC,
+        Integer pageTokenLWC
     ) {
         consumableproductdetailsRecords = consumableproductdetailsRecordsLwc;
         pageRecordsLwc = pageRecordsLwcLwc;
@@ -1465,6 +1518,14 @@
         accountName = accountNameLwc;
         userWorkLocation = userWorkLocationLwc;
         agencyProType = agencyProTypeLwc;
+        product2Selected = new List<Product2__c>();
+        pagesize = pageSizeLWC;
+        pageToken = pageTokenLWC > 2000 ? 2000 : pageTokenLWC;
+        addSize = 0;
+        addData = new List<ConsumableorderdetailsInfo>();
+        System.debug('start addData = ' + addData);
+        System.debug('accountName = ' + accountName);
+        System.debug('userWorkLocation = ' + userWorkLocation);
         String sqlagencyProType = '%' + agencyProTypeLwc + '%';
         List<AggregateResult> orderdetailCount = [
             SELECT count(id), Consumable_Product__c cpc, Box_Piece__c
@@ -1509,9 +1570,9 @@
         consumableorderdetailsSelectRecords = new List<ConsumableorderdetailsInfo>();
         //consumableorderdetailsSelectRecords = reSet;
         String soql = makeSoql(category1, category3, category4, category5);
-        System.debug('soql = ' + soql);
         size = Integer.valueOf(System.Label.orderdetLimitsize);
         initStandardController(soql);
+        System.debug('soql = ' + soql);
         product2Selected = Database.query(soql);
         for (Integer i = 0; i < product2Selected.size(); i++) {
             MidMap.put(product2Selected[i].Id, new ConsumableorderdetailsInfo(product2Selected[i]));
@@ -1591,18 +1652,52 @@
         }
 
         consumableorderdetailsSelectRecords.sort();
-        //add by rentx
-        //noOfRecords = consumableorderdetailsSelectRecords.size();
-        //add by rentx
-        //makepagerecords();
         makepagerecordsLwc();
-        // this.sortKey = '1';
-        // this.preSortKey = '1';
-        // this.sortOrderAsc = false;
-        // this.sortOrder = new String[8];
-        // this.sortOrder = new String[]{' ',' ',' ',' ','鈫�','','',''};
-        data.put('pageRecords', pageRecords);
-        data.put('test', 'test');
+        //鍒嗛〉
+        PaginatedAccounts paginatedAccounts = new PaginatedAccounts();
+        totalCount = pageRecords.size();
+        paginatedAccounts.nextPageToken = (pageToken + pageSize < totalCount) ? pageToken + pageSize : null;
+        paginatedAccounts.recordStart = pageToken + 1;
+        paginatedAccounts.pageNumber = pageToken / pageSize + 1;
+        Integer recordEnd = pageSize * paginatedAccounts.pageNumber;
+        paginatedAccounts.recordEnd = totalCount >= recordEnd ? recordEnd : totalCount;
+        paginatedAccounts.totalRecords = totalCount;
+
+        System.debug('addSize = ' + addSize);
+        Integer startIdx;
+        Integer endIdx;
+        startIdx = pageToken;
+        endIdx = pageToken + pageSize;
+        List<ConsumableorderdetailsInfo> pageRecordsTemp = new List<ConsumableorderdetailsInfo>();
+        if (endIdx > pageRecords.size()) {
+            endIdx = pageRecords.size();
+        }
+
+        System.debug('addData.size() = ' + addData.size());
+        for (ConsumableorderdetailsInfo ci : addData) {
+            pageRecordsTemp.add(ci);
+        }
+        System.debug('startIdx = ' + startIdx);
+        System.debug('endIdx = ' + endIdx);
+        System.debug('skipData = ' + skipData);
+        System.debug('pageRecords = ' + pageRecords.size());
+        String hos = '';
+        for (Integer i = startIdx; i < endIdx; i++) {
+            System.debug('skipData.get(pageRecords.get(i).Prod.Id) = ' + skipData.get(pageRecords.get(i).Prod.Id));
+            if (pageRecords.get(i).hospitalSpecialOffer == true) {
+                hos = 'ishos';
+            } else {
+                hos = 'nothos';
+            }
+            if (skipData.get(pageRecords.get(i).Prod.Id + hos) == null) {
+                pageRecordsTemp.add(pageRecords.get(i));
+            }
+        }
+
+        System.debug('pageRecordsTemp = ' + pageRecordsTemp.size());
+        data.put('paginatedAccounts', paginatedAccounts);
+        data.put('pageRecords', pageRecordsTemp);
+        data.put('SearchDone', SearchDone);
         res.status = 'Success';
         res.code = 200;
         System.debug('res = ' + res);
@@ -1612,10 +1707,12 @@
     private static String makeSoql(String CateName, String Category3, String Category4, String Category5) {
         String sqlTail1 = '(\'';
         for (Integer i = 0; i < zaikuId.size(); i++) {
-            if (i < zaikuId.size() - 1) {
-                sqlTail1 += zaikuId[i] + '\',\'';
-            } else {
-                sqlTail1 += zaikuId[i];
+            if (zaikuId[i] != null) {
+                if (i < zaikuId.size() - 1) {
+                    sqlTail1 += zaikuId[i] + '\',\'';
+                } else {
+                    sqlTail1 += zaikuId[i];
+                }
             }
         }
         sqlTail1 += '\')';
@@ -1659,10 +1756,12 @@
     public static String makeSoqlinventory() {
         String sqlTail = '(\'';
         for (Integer i = 0; i < zaikuId.size(); i++) {
-            if (i < zaikuId.size() - 1) {
-                sqlTail += zaikuId[i] + '\',\'';
-            } else {
-                sqlTail += zaikuId[i];
+            if (zaikuId[i] != null) {
+                if (i < zaikuId.size() - 1) {
+                    sqlTail += zaikuId[i] + '\',\'';
+                } else {
+                    sqlTail += zaikuId[i];
+                }
             }
         }
         sqlTail += '\')';
@@ -1701,6 +1800,7 @@
         }
         System.debug('zhj3');
         pageRecords = new List<ConsumableorderdetailsInfo>();
+        System.debug('reSet.size() = ' + reSet.size());
         if (editAble && String.isBlank(arriveorder)) {
             pageRecords = reSet;
         }
@@ -1708,7 +1808,7 @@
         //Integer pageendNo = (setCon.getPageNumber() * size)>noOfRecords ? noOfRecords :(setCon.getPageNumber() * size-1);
         Integer addNo = 0;
         //update by rentx 2021-2-26 start
-        System.debug('consumableorderdetailsSelectRecords = ' + consumableorderdetailsSelectRecords);
+        System.debug('consumableorderdetailsSelectRecords.size() = ' + consumableorderdetailsSelectRecords.size());
         for (ConsumableorderdetailsInfo info : consumableorderdetailsSelectRecords) {
             Consumable_Orderdetails__c orderdetails1 = new Consumable_Orderdetails__c();
             if (
@@ -1733,6 +1833,7 @@
     public static List<ConsumableorderdetailsInfo> makepagerecordsLwc() {
         List<ConsumableorderdetailsInfoLwc> reSetLwc = new List<ConsumableorderdetailsInfoLwc>();
         Map<String, String> selectedIdMap = new Map<String, String>();
+        skipData = new Map<String, String>();
         System.debug('makepagerecordsLwc pageRecordsLwc = ' + pageRecordsLwc);
         //鍙栧嚭閫夋嫨鐨勪骇鍝�
         if (pageRecordsLwc != null) {
@@ -1741,18 +1842,20 @@
                 if (ass.check == true) {
                     if (ass.hospitalSpecialOffer == true) {
                         selectedIdMap.put(ass.Prod.Id + 'ishos', ass.Prod.Id);
+                        skipData.put(ass.Prod.Id + 'ishos', ass.Prod.Id);
                     } else {
                         selectedIdMap.put(ass.Prod.Id + 'nothos', ass.Prod.Id);
+                        skipData.put(ass.Prod.Id + 'nothos', ass.Prod.Id);
                     }
                     reSetLwc.add(ass);
                 }
             }
         }
-        System.debug('reSetLwc = ' + reSetLwc);
         System.debug('selectedIdMap = ' + selectedIdMap);
         pageRecords = new List<ConsumableorderdetailsInfo>();
         if (editAble && String.isBlank(arriveorder)) {
             List<ConsumableorderdetailsInfo> reSet = new List<ConsumableorderdetailsInfo>();
+            System.debug('reSetLwc = ' + reSetLwc);
             for (ConsumableorderdetailsInfoLwc assLwc : reSetLwc) {
                 ConsumableorderdetailsInfo ci = new ConsumableorderdetailsInfo();
                 ci.check = assLwc.check;
@@ -1779,19 +1882,24 @@
                 reSet.add(ci);
             }
             pageRecords = reSet;
+            System.debug('reSet = ' + reSet);
+            addData = reSet.clone();
+            System.debug('addData = reSet = ' + addData);
         }
         //Integer pagestartNo = (setCon.getPageNumber() * size)-size;
         //Integer pageendNo = (setCon.getPageNumber() * size)>noOfRecords ? noOfRecords :(setCon.getPageNumber() * size-1);
         Integer addNo = 0;
         //update by rentx 2021-2-26 start
-        System.debug('consumableorderdetailsSelectRecords = ' + consumableorderdetailsSelectRecords);
+        System.debug('consumableorderdetailsSelectRecords.size() = ' + consumableorderdetailsSelectRecords.size());
         for (ConsumableorderdetailsInfo info : consumableorderdetailsSelectRecords) {
             Consumable_Orderdetails__c orderdetails1 = new Consumable_Orderdetails__c();
             if (
                 (info.hospitalSpecialOffer && selectedIdMap.containsKey(info.Prod.Id + 'ishos')) ||
                 (info.hospitalSpecialOffer == false && selectedIdMap.containsKey(info.Prod.Id + 'nothos'))
             ) {
+                System.debug('鍘绘帀鐨刬d : ' + info.Prod.Id);
                 addNo++;
+                addSize++;
             } else {
                 if (info.check == false) {
                     info.orderdetails1 = orderdetails1;
@@ -1800,7 +1908,8 @@
                 addNo++;
             }
         }
-        System.debug('pageRecords = ' + pageRecords);
+        System.debug('pageRecords.size() = ' + pageRecords.size());
+        System.debug('end  addData = ' + addData);
         return pageRecords;
     }
 
@@ -1810,84 +1919,98 @@
         Consumable_order__c cocLwc,
         String hospitalInfoLwc,
         String hospitalNameLwc,
-        String secondaryDistributor,
+        String secondaryDistributorLwc,
         List<ConsumableorderdetailsInfoLwc> pageRecordsLwc,
-        String accountid,
-        String ESetId,
-        List<ConsumableorderdetailsInfo> consumableproductdetailsRecordsLwc
+        String accountidLwc,
+        String ESetIdLwc,
+        List<ConsumableorderdetailsInfo> consumableproductdetailsRecordsLwc,
+        String agencyProTypeLwc,
+        String userWorkLocationLwc
     ) {
-        System.debug('cocLwc = ' + cocLwc);
         coc = cocLwc;
         HospitalInfo = hospitalInfoLwc;
         HospitalName = hospitalNameLwc;
-        SecondDealer = secondaryDistributor;
+        SecondDealer = secondaryDistributorLwc;
         pageRecordsLwc = pageRecordsLwc;
+        accountid = accountidLwc;
         consumableproductdetailsRecords = consumableproductdetailsRecordsLwc;
+        ESetId = ESetIdLwc;
+        agencyProType = agencyProTypeLwc;
+        userWorkLocation = userWorkLocationLwc;
+
+        System.debug('coc = ' + coc);
+        System.debug('HospitalInfo = ' + HospitalInfo);
+        System.debug('HospitalName = ' + HospitalName);
+        System.debug('SecondDealer = ' + SecondDealer);
+        System.debug('pageRecordsLwc = ' + pageRecordsLwc);
+        System.debug('accountid = ' + accountid);
+        System.debug('consumableproductdetailsRecords = ' + consumableproductdetailsRecords);
+        System.debug('ESetId = ' + ESetId);
         ResponseBodyLWC res = new ResponseBodyLWC();
         Map<String, object> data = new Map<String, object>();
         res.entity = data;
         //璁㈠崟淇℃伅纭
         if (coc.SummonsForDirction__c == '' || coc.SummonsForDirction__c == null) {
-            // coc.SummonsForDirction__c.addError('璇疯緭鍏ユ寚绀哄崟鐩殑銆�');
+            // coc.SummonsForDirction__c.addError('璇疯緭鍏ユ寚绀哄崟鐩殑');
             // return null;
-            return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ユ寚绀哄崟鐩殑銆�', '');
+            return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ユ寚绀哄崟鐩殑', '');
         } else if (coc.SummonsForDirction__c == '鐩存帴閿�鍞粰鍖婚櫌') {
             if (String.isBlank(HospitalInfo) || String.isBlank(HospitalName)) {
-                // coc.addError('璇疯緭鍏ュ尰闄€��');
+                // coc.addError('璇疯緭鍏ュ尰闄�');
                 // return null;
-                return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ尰闄€��', '');
+                return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ尰闄�', '');
             }
             if (String.isBlank(coc.Order_ForCustomerText__c)) {
-                // coc.Order_ForCustomerText__c.addError('璇疯緭鍏ョ瀹ゃ��');
+                // coc.Order_ForCustomerText__c.addError('璇疯緭鍏ョ瀹�');
                 // return null;
-                return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ョ瀹ゃ��', '');
+                return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ョ瀹�', '');
             } else if (String.isNotBlank(SecondDealer) || String.isNotBlank(coc.Order_ForDealerText__c)) {
-                // coc.addError('涓嶉渶瑕佷簩绾х粡閿�鍟嗗拰缁忛攢鍟�(褰曞叆)淇℃伅銆�' );
+                // coc.addError('涓嶉渶瑕佷簩绾х粡閿�鍟嗗拰缁忛攢鍟�(褰曞叆)淇℃伅' );
                 // return null;
-                return new ResponseBodyLWC('Error', 500, '涓嶉渶瑕佷簩绾х粡閿�鍟嗗拰缁忛攢鍟�(褰曞叆)淇℃伅銆�', '');
+                return new ResponseBodyLWC('Error', 500, '涓嶉渶瑕佷簩绾х粡閿�鍟嗗拰缁忛攢鍟�(褰曞叆)淇℃伅', '');
             }
         } else if (coc.SummonsForDirction__c == '鍖婚櫌璇曠敤') {
             if (String.isBlank(HospitalInfo) || String.isBlank(HospitalName)) {
-                // coc.addError('璇疯緭鍏ュ尰闄€��');
+                // coc.addError('璇疯緭鍏ュ尰闄�');
                 // return null;
-                return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ尰闄€��', '');
+                return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ尰闄�', '');
             }
             if (String.isBlank(coc.Order_ForCustomerText__c)) {
-                // coc.Order_ForCustomerText__c.addError('璇疯緭鍏ョ瀹ゃ��');
+                // coc.Order_ForCustomerText__c.addError('璇疯緭鍏ョ瀹�');
                 // return null;
-                return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ョ瀹ゃ��', '');
+                return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ョ瀹�', '');
             }
         } else if (coc.SummonsForDirction__c == '閿�鍞粰浜岀骇缁忛攢鍟�') {
             if (String.isBlank(SecondDealer) && String.isBlank(coc.Order_ForDealerText__c)) {
-                // coc.addError('蹇呴』杈撳叆浜岀骇缁忛攢鍟嗘垨缁忛攢鍟�(褰曞叆)銆�');
+                // coc.addError('蹇呴』杈撳叆浜岀骇缁忛攢鍟嗘垨缁忛攢鍟�(褰曞叆)');
                 // return null;
-                return new ResponseBodyLWC('Error', 500, '蹇呴』杈撳叆浜岀骇缁忛攢鍟嗘垨缁忛攢鍟�(褰曞叆)銆�', '');
+                return new ResponseBodyLWC('Error', 500, '蹇呴』杈撳叆浜岀骇缁忛攢鍟嗘垨缁忛攢鍟�(褰曞叆)', '');
             }
             if (String.isBlank(HospitalInfo) || String.isBlank(HospitalName)) {
-                // coc.addError('璇疯緭鍏ュ尰闄€��');
+                // coc.addError('璇疯緭鍏ュ尰闄�');
                 // return null;
-                return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ尰闄€��', '');
+                return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ尰闄�', '');
             }
             if (String.isBlank(coc.Order_ForCustomerText__c)) {
-                // coc.Order_ForCustomerText__c.addError('璇疯緭鍏ョ瀹ゃ��');
+                // coc.Order_ForCustomerText__c.addError('璇疯緭鍏ョ瀹�');
                 // return null;
-                return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ョ瀹ゃ��', '');
+                return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ョ瀹�', '');
             }
         } else if (coc.SummonsForDirction__c == '浜掔浉璋冭揣') {
             if (String.isNotBlank(HospitalInfo) || String.isNotBlank(HospitalName)) {
-                // coc.addError('涓嶉渶瑕佽緭鍏ュ尰闄€��');
+                // coc.addError('涓嶉渶瑕佽緭鍏ュ尰闄�');
                 // return null;
-                return new ResponseBodyLWC('Error', 500, '涓嶉渶瑕佽緭鍏ュ尰闄€��', '');
+                return new ResponseBodyLWC('Error', 500, '涓嶉渶瑕佽緭鍏ュ尰闄�', '');
             }
             if (String.isNotBlank(coc.Order_ForCustomerText__c)) {
-                // coc.Order_ForCustomerText__c.addError('涓嶉渶瑕佽緭鍏ョ瀹ゃ��');
+                // coc.Order_ForCustomerText__c.addError('涓嶉渶瑕佽緭鍏ョ瀹�');
                 // return null;
-                return new ResponseBodyLWC('Error', 500, '涓嶉渶瑕佽緭鍏ョ瀹ゃ��', '');
+                return new ResponseBodyLWC('Error', 500, '涓嶉渶瑕佽緭鍏ョ瀹�', '');
             }
             if (String.isBlank(SecondDealer) && String.isBlank(coc.Order_ForDealerText__c)) {
-                // coc.addError('蹇呴』杈撳叆浜岀骇缁忛攢鍟嗘垨缁忛攢鍟�(褰曞叆)銆�');
+                // coc.addError('蹇呴』杈撳叆浜岀骇缁忛攢鍟嗘垨缁忛攢鍟�(褰曞叆)');
                 // return null;
-                return new ResponseBodyLWC('Error', 500, '蹇呴』杈撳叆浜岀骇缁忛攢鍟嗘垨缁忛攢鍟�(褰曞叆)銆�', '');
+                return new ResponseBodyLWC('Error', 500, '蹇呴』杈撳叆浜岀骇缁忛攢鍟嗘垨缁忛攢鍟�(褰曞叆)', '');
             }
         }
 
@@ -2054,34 +2177,34 @@
             for (ConsumableorderdetailsInfoLwc ass : pageRecordsLwc) {
                 if (ass.check == true) {
                     if (ass.orderdetails1.Delivery_List_RMB__c < 0) {
-                        // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)銆�');
+                        // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)');
                         // return null;
-                        return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)銆�', '');
+                        return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)', '');
                     }
                     if (ass.orderdetails1.Delivery_List_RMB__c == null && coc.SummonsForDirction__c != '鍖婚櫌璇曠敤') {
-                        // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ュ嚭璐у崟浠� (鍏�)銆�');
+                        // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ュ嚭璐у崟浠� (鍏�)');
                         // return null;
-                        return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)銆�', '');
+                        return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)', '');
                     }
                     if (
                         ass.orderdetails1.Delivery_List_RMB__c == 0 &&
                         (coc.SummonsForDirction__c == '閿�鍞粰浜岀骇缁忛攢鍟�' ||
                         coc.SummonsForDirction__c == '鐩存帴閿�鍞粰鍖婚櫌')
                     ) {
-                        // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ュ嚭璐у崟浠� (鍏�)銆�');
+                        // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ュ嚭璐у崟浠� (鍏�)');
                         // return null;
-                        return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐у崟浠� (鍏�)銆�', '');
+                        return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐у崟浠� (鍏�)', '');
                     }
                     if (ass.orderdetails1.Shipment_Count__c == null || ass.orderdetails1.Shipment_Count__c == 0) {
-                        // ass.orderdetails1.Shipment_Count__c.addError('璇疯緭鍏ュ嚭璐ф暟閲忋��');
+                        // ass.orderdetails1.Shipment_Count__c.addError('璇疯緭鍏ュ嚭璐ф暟閲�');
                         // return null;
-                        return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐ф暟閲忋��', '');
+                        return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐ф暟閲�', '');
                     }
 
                     if (ass.orderdetails1.Box_Piece__c == null || ass.orderdetails1.Box_Piece__c == '') {
-                        // ass.orderdetails1.Box_Piece__c.addError('璇疯緭鍏ュ崟浣嶃��');
+                        // ass.orderdetails1.Box_Piece__c.addError('璇疯緭鍏ュ崟浣�');
                         // return null;
-                        return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ崟浣嶃��', '');
+                        return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ崟浣�', '');
                     }
                     if (ass.orderdetails1.Box_Piece__c == '鐩�') {
                         if (ass.orderdetails1.Shipment_Count__c > ass.Boxnumber) {
@@ -2217,29 +2340,29 @@
             for (ConsumableorderdetailsInfoLwc ass : pageRecordsLwc) {
                 if (ass.check == true) {
                     if (ass.orderdetails1.Delivery_List_RMB__c < 0) {
-                        // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)銆�');
+                        // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)');
                         // return null;
-                        return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)銆�', '');
+                        return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)', '');
                     }
                     Consumable_orderdetails__c InsAfterDel = new Consumable_orderdetails__c();
                     if (ass.orderdetails1.Delivery_List_RMB__c == null && coc.SummonsForDirction__c != '鍖婚櫌璇曠敤') {
-                        // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ュ嚭璐у崟浠� (鍏�)銆�');
+                        // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ュ嚭璐у崟浠� (鍏�)');
                         // return null;
-                        return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐у崟浠� (鍏�)銆�', '');
+                        return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐у崟浠� (鍏�)', '');
                     }
                     if (
                         ass.orderdetails1.Delivery_List_RMB__c == 0 &&
                         (coc.SummonsForDirction__c == '閿�鍞粰浜岀骇缁忛攢鍟�' ||
                         coc.SummonsForDirction__c == '鐩存帴閿�鍞粰鍖婚櫌')
                     ) {
-                        // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ュ嚭璐у崟浠� (鍏�)銆�');
+                        // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ュ嚭璐у崟浠� (鍏�)');
                         // return null;
-                        return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐у崟浠� (鍏�)銆�', '');
+                        return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐у崟浠� (鍏�)', '');
                     }
                     if (ass.orderdetails1.Box_Piece__c == null || ass.orderdetails1.Box_Piece__c == '') {
-                        // ass.orderdetails1.Box_Piece__c.addError('璇疯緭鍏ュ崟浣嶃��');
+                        // ass.orderdetails1.Box_Piece__c.addError('璇疯緭鍏ュ崟浣�');
                         // return null;
-                        return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ崟浣嶃��', '');
+                        return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ崟浣�', '');
                     }
                     if (ass.orderdetails1.Box_Piece__c == '鐩�') {
                         if (ass.orderdetails1.Shipment_Count__c > ass.Boxnumber) {
@@ -2278,9 +2401,9 @@
                         }
                     }
                     if (ass.orderdetails1.Shipment_Count__c == null || ass.orderdetails1.Shipment_Count__c == 0) {
-                        // ass.orderdetails1.Shipment_Count__c.addError('璇疯緭鍏ュ嚭璐ф暟閲忋��');
+                        // ass.orderdetails1.Shipment_Count__c.addError('璇疯緭鍏ュ嚭璐ф暟閲�');
                         // return null;
-                        return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐ф暟閲忋��', '');
+                        return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐ф暟閲�', '');
                     } else {
                         String str = string.valueOf(i);
                         if (str.length() == 1) {
@@ -2390,23 +2513,105 @@
     public static List<LookupSearchResult> search(String searchTerm) {
         System.debug('searchTerm = ' + searchTerm);
         String nameCondition = '';
-        nameCondition += '%' + String.escapeSingleQuotes(''.replaceAll('%', '\\%')) + '%';
-        List<Account> accs;
+        nameCondition += '%' + String.escapeSingleQuotes(searchTerm.replaceAll('%', '\\%')) + '%';
+        List<Account> accs = new List<Account>();
         System.debug('nameCondition = ' + nameCondition);
-        accs = [
-            SELECT id, Parentid
-            FROM Account
-            WHERE
-                Parent.Name LIKE :nameCondition
-                AND Contract_Decide_Start_Date__c <= :Date.Today()
-                AND Contract_Decide_End_Date__c >= :Date.Today()
-        ];
+        //鏌ヨ鏉′欢淇敼
+        //绛涢�夊垽鏂潯浠讹細褰撳墠璐㈠勾鐨�4/1 ~ 绗簩骞寸殑6/30 聽& ET or ENG绫诲瀷 & 褰撳墠鐢ㄦ埛绫诲瀷
+        //1 and 2
+        //1. Integer year 2022/4/1 ~ 2023/6/30
+        //寮�濮嬫棩鏈� + 缁撴潫鏃ユ湡
+        //Contract_Decide_Start_Date__c>=寮�濮嬫棩鏈�  and Contract_Decide_End_Date__c<缁撴潫鏃ユ湡
+        //2. 娣诲姞缁忛攢鍟嗗厑閿�绫诲瀷锛欵T缁忛攢鍟嗗崗璁紱ENG鑰楁潗缁忛攢鍟嗗崗璁�
+        //鍙栧綋鍓嶇敤鎴风殑绫诲瀷锛屽鏋滅敤鎴风被鍨嬫槸ET,ET缁忛攢鍟嗗崗璁� = true
+        // Date today = Date.today();
+        // Integer thisYear = today.year();
+        // Integer nextYear = today.year() + 1;
+        // Date thisDatetime = Date.newInstance(thisYear, 4, 1);
+        // Date nextDatetime = Date.newInstance(nextYear, 6, 30);
+        // System.debug('thisDatetime = ' + thisDatetime);
+        // System.debug('nextDatetime = ' + nextDatetime);
 
+        // User UserProTypecTemp = [select UserPro_Type__c from User where id =: UserInfo.getUserId()];
+        // System.debug('UserInfo.getUserId() = ' + UserInfo.getUserId());
+        // System.debug('UserProTypecTemp = ' + UserProTypecTemp);
+        // System.debug('UserProTypecTemp.UserPro_Type__c = ' + UserProTypecTemp.UserPro_Type__c);
+        // if (UserProTypecTemp.UserPro_Type__c == 'ENG') {
+        //     accs = [
+        //         SELECT Id, Name, Department_Class__c, Department_Class__r.Name, Hospital__c, Hospital__r.Name, BillingCity
+        //         FROM Account
+        //         WHERE
+        //             // Name = '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙�'
+        //             // AND 
+        //             Name LIKE :nameCondition
+        //             AND RecordType.DeveloperName = 'AgencyContract'
+        //             AND Contract_Decide_Start_Date__c >= :thisDatetime
+        //             AND Contract_Decide_End_Date__c <= :nextDatetime
+        //             AND ENG_Dealer__c = true
+        //         ORDER BY Name
+        //         LIMIT 49
+        //     ];
+        // }
+        // if (UserProTypecTemp.UserPro_Type__c == 'ET') {
+        //     accs = [
+        //         SELECT Id, Name, Department_Class__c, Department_Class__r.Name, Hospital__c, Hospital__r.Name, BillingCity
+        //         FROM Account
+        //         WHERE
+        //             // Name = '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙�'
+        //             // AND 
+        //             Name LIKE :nameCondition
+        //             AND RecordType.DeveloperName = 'AgencyContract'
+        //             AND Contract_Decide_Start_Date__c >= :thisDatetime
+        //             AND Contract_Decide_End_Date__c <= :nextDatetime
+        //             AND ET_SP_Dealer__c = true
+        //         ORDER BY Name
+        //         LIMIT 49
+        //     ];
+        // }
+
+
+        Date today = Date.today();
+        //Date today = Date.newInstance(2023, 3, 1);
+        Integer thisMonth = today.month();
+        System.debug('thisMonth = ' + thisMonth);
+
+        Integer lastYear = today.year() - 1;
+        Integer thisYear = today.year();
+        Integer nextYear = today.year() + 1;
+        
+        Date lastDatetime = Date.newInstance(lastYear, 4, 1);
+        Date thisDatetime = Date.newInstance(thisYear, 4, 1);
+        Date thisDatetime2 = Date.newInstance(thisYear, 7, 1);
+        Date nextDatetime = Date.newInstance(nextYear, 7, 1);
+        System.debug('lastDatetime = ' + lastDatetime);
+        System.debug('thisDatetime = ' + thisDatetime);
+        System.debug('thisDatetime2 = ' + thisDatetime2);
+        System.debug('nextDatetime = ' + nextDatetime);
+        System.debug('UserInfo.getUserId() = ' + UserInfo.getUserId());
+        User UserProTypecTemp = [select UserPro_Type__c from User where id =: UserInfo.getUserId()];
+
+        String sql = 'SELECT id, Parentid FROM Account WHERE Parent.Name LIKE :nameCondition ';
+        if(thisMonth < 4){
+            sql += 'AND Contract_Decide_Start_Date__c >= :lastDatetime AND Contract_Decide_End_Date__c < :thisDatetime2 ';
+        }else if(thisMonth >= 4 && thisMonth <= 6){
+            sql += 'AND Contract_Decide_Start_Date__c >= :lastDatetime AND Contract_Decide_End_Date__c < :nextDatetime ';
+        }else{
+            sql += 'AND Contract_Decide_Start_Date__c >= :thisDatetime AND Contract_Decide_End_Date__c < :nextDatetime ';
+        }
+        if (UserProTypecTemp.UserPro_Type__c == 'ENG') {
+            sql += 'AND ENG_Dealer__c = true';
+        }
+        if (UserProTypecTemp.UserPro_Type__c == 'ET') {
+            sql += 'AND ET_SP_Dealer__c = true';
+        }
+        System.debug('sql = ' + sql);
+        accs = Database.query(sql);
         // 鐢ㄤ簬淇濆瓨鐗圭害缁忛攢鍟嗗尮閰嶅埌鐨勫叾鐖剁被鐨刬d
         Set<String> pids = new Set<String>();
         for (Account acc : accs) {
             pids.add(acc.Parentid);
         }
+
         accs = [
             SELECT Id, Name, Department_Class__c, Department_Class__r.Name, Hospital__c, Hospital__r.Name, BillingCity
             FROM Account
@@ -2415,11 +2620,37 @@
                 OR (Name = '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙�'
                 AND Name LIKE :nameCondition))
                 AND RecordType.DeveloperName = 'Agency'
-                AND Is_Active__c != '鐒″姽'
             ORDER BY Name
-            LIMIT 5
+            LIMIT 49
         ];
 
+        // accs = [
+        //     SELECT id, Parentid
+        //     FROM Account
+        //     WHERE
+        //         Parent.Name LIKE :nameCondition
+        //         AND Contract_Decide_Start_Date__c <= :Date.Today()
+        //         AND Contract_Decide_End_Date__c >= :Date.Today()
+        // ];
+
+        // 鐢ㄤ簬淇濆瓨鐗圭害缁忛攢鍟嗗尮閰嶅埌鐨勫叾鐖剁被鐨刬d
+        // Set<String> pids = new Set<String>();
+        // for (Account acc : accs) {
+        //     pids.add(acc.Parentid);
+        // }
+        // accs = [
+        //     SELECT Id, Name, Department_Class__c, Department_Class__r.Name, Hospital__c, Hospital__r.Name, BillingCity
+        //     FROM Account
+        //     WHERE
+        //         (Id IN :pids
+        //         OR (Name = '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙�'
+        //         AND Name LIKE :nameCondition))
+        //         AND RecordType.DeveloperName = 'Agency'
+        //         AND Is_Active__c != '鐒″姽'
+        //     ORDER BY Name
+        //     LIMIT 5
+        // ];
+        System.debug('accs = ' + accs);
         List<LookupSearchResult> results = new List<LookupSearchResult>();
         String accountIcon = 'standard:account';
         for (Account account : accs) {
@@ -2453,7 +2684,7 @@
         Map<String, object> data = new Map<String, object>();
         res.entity = data;
         List<ContentVersion> cvList = [
-            SELECT id, Title, CreatedBy.Name, PathOnClient,CreatedDate
+            SELECT id, Title, CreatedBy.Name, PathOnClient, CreatedDate, ContentDocumentId
             FROM ContentVersion
             WHERE FirstPublishLocationId = :recordId
         ];
@@ -2518,7 +2749,7 @@
         ESetId = ESetId;
 
         Savepoint sp = Database.setSavepoint();
-        try{
+        try {
             List<Consumable_order__c> qs = new List<Consumable_order__c>();
             List<Consumable_orderdetails__c> Dqs = new List<Consumable_orderdetails__c>();
             Dqs = [SELECT Id FROM Consumable_orderdetails__c WHERE Consumable_order__c = :ESetId];
@@ -2527,7 +2758,7 @@
                 delete Dqs;
                 delete qs;
             }
-        }catch(Exception e){
+        } catch (Exception e) {
             Database.rollback(sp);
             System.debug(e.getMessage() + e.getLineNumber());
             return new ResponseBodyLWC('Error', 500, e.getMessage(), '');
@@ -2742,4 +2973,18 @@
         @AuraEnabled
         public String Category5 { get; set; }
     }
+
+    //鍒嗛〉Bean
+    public class PaginatedAccounts {
+        @AuraEnabled
+        public Integer nextPageToken;
+        @AuraEnabled
+        public Integer pageNumber { get; set; }
+        @AuraEnabled
+        public Integer totalRecords { get; set; }
+        @AuraEnabled
+        public Integer recordStart { get; set; }
+        @AuraEnabled
+        public Integer recordEnd { get; set; }
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.1