From cbab3d8795d1e0589e37261d978eac22cc904318 Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期二, 29 三月 2022 13:38:57 +0800
Subject: [PATCH] 20220329KPI黄千龙提交

---
 force-app/main/default/classes/EquipmentCoverageTargetBatch.cls   |  163 +++++++------
 force-app/main/default/classes/EquipmentRealCoverageRealBatch.cls |  152 ++++++------
 force-app/main/default/classes/EquipmentRenewMoleculeBatch.cls    |  182 ++++++++-------
 force-app/main/default/classes/EquipmentRenewTargetBatch.cls      |  218 ++++++++++--------
 4 files changed, 384 insertions(+), 331 deletions(-)

diff --git a/force-app/main/default/classes/EquipmentCoverageTargetBatch.cls b/force-app/main/default/classes/EquipmentCoverageTargetBatch.cls
index 5283998..1e0b322 100644
--- a/force-app/main/default/classes/EquipmentCoverageTargetBatch.cls
+++ b/force-app/main/default/classes/EquipmentCoverageTargetBatch.cls
@@ -2,19 +2,34 @@
 @Author: 榛勫崈榫�
 @Name: EquipmentCoverageTargetBatch
 @CreateDate: 22/03/2022
-@Description: 鏄惁瑕嗙洊鐜囧疄闄咃紙鍒嗗瓙锛�
+@Description: 鏄惁瑕嗙洊鐜囩洰鏍囷紙鍒嗘瘝锛�
 @Version 1.0
 *****************************************************************************************************/
-global class EquipmentRealCoverageRealBatch implements Database.Batchable<sObject>,Database.Stateful {
+global class EquipmentCoverageTargetBatch implements Database.Batchable<sObject>,Database.Stateful {
     public String query;
     public Date start_dateH1 ;
     public Date end_dateH1 ;
+    public List<Id> hospIds = new List<Id>();
     public Date toDayTime = Date.today();
-    private BatchIF_Log__c iflog;
     public String OCSM_Period_half;
     public String OCSM_Period = 'FY'+toDayTime.year();
-    global EquipmentRealCoverageRealBatch() {
+    private BatchIF_Log__c iflog;
+    public List < String > accountIdList;
+    global EquipmentCoverageTargetBatch() {
         this.query = query;
+    }
+
+    global EquipmentCoverageTargetBatch(List < String > accountIdList) {
+        this.query = query;
+        this.accountIdList = accountIdList;
+    }
+
+    global Database.QueryLocator start(Database.BatchableContext bc) {
+        // query = 'select Id,(select id,IF_Coverage_Target_Asset__c,IF_Coverage_Real_Asset__c,CurrentContract__r.Contract_End_Date__c,CurrentContract__r.Contract_Conclusion_Date__c,Product2.Category4__c,Product2.ServiceCategory__c,Product2.Category3__c from Asset_Hospital__r where Status != \'寤冩\' and Status != \'寰呮姤搴焅''
+        //              +' and IF_Parts_production__c != \'1\''
+        //              +' and ((SerMarGuranteeType__c != \'鏈嶅姟澶氬勾淇濅慨\' and SerMarGuranteeType__c != \'甯傚満澶氬勾淇濅慨\') or Extend_Gurantee_DateTo__c >= :egdTime)'
+        //              +' and Product2.ServiceCategory__c != null) from Account where id in :hospIds';
+        system.debug('鎵цstart');
         iflog = new BatchIF_Log__c();
         iflog.Type__c = 'PushNotification';
         iflog.Log__c  = 'EquipmentRealCoverageBatch start\n';
@@ -25,34 +40,42 @@
         }else{
             OCSM_Period_half = '2H';
         }
-    }
- 
-    global Database.QueryLocator start(Database.BatchableContext bc) {
-         system.debug('鎵цstart');
-        query = 'select id,Hospital__c,IF_Coverage_Target_Asset__c,IF_Coverage_Real_Asset__c,CurrentContract__r.Contract_End_Date__c,CurrentContract__r.Contract_Conclusion_Date__c,Product2.Category4__c,Product2.ServiceCategory__c,Product2.Category3__c from Asset where '
-                     +' IF_Parts_production__c != \'1\' and CurrentContract__c != null'
-                     +' and (CurrentContract__r.Contract_End_Date__c >= :start_dateH1 and CurrentContract__r.Contract_Conclusion_Date__c <= :end_dateH1) order by hospital__c';
-            // 瀹為檯璁惧鍚堝悓鏃堕棿鍖洪棿1H(4,9);2H(10,3)
-            if (toDayTime.month() >= 4 && toDayTime.month() <= 9) {
-                start_dateH1 = Date.newInstance(toDayTime.year(),9,1);
-                end_dateH1 = Date.newInstance(toDayTime.year(),9,30);
-            }else{
-                start_dateH1 = Date.newInstance(toDayTime.year(),3,1);
-                end_dateH1 = Date.newInstance(toDayTime.year()+1,3,31);
-            }
+        // 5鏉′互涓婅蒋鎬ч暅鍖婚櫌&&鍖婚櫌鏈夋晥
+        Date egdTime = Date.newInstance(toDayTime.year()+1,3,1);
+        List<AggregateResult> Asset1 = new List<AggregateResult>();
+        if (accountIdList != null && accountIdList.size() > 0) {
+            Asset1 = [select count(Id),Hospital__c from asset where Hospital__c IN :accountIdList and Product2.ServiceCategory__c ='杞�ч暅'  Group by Hospital__c having count(Id)>=5];
+        }else{
+            Asset1 = [select count(Id),Hospital__c from asset where Product2.ServiceCategory__c ='杞�ч暅'  Group by Hospital__c having count(Id)>=5];
+        }
+
+        if(Asset1!=null && Asset1.size() > 0){
+           for (AggregateResult a1 : Asset1) {
+               hospIds.add(String.valueOf(a1.get('Hospital__c')));
+           }
+        }
+        query = 'select Id,Hospital__c,Hospital__r.IF_Coverage_Target_HP__c,IF_Coverage_Target_Asset__c,IF_Coverage_Real_Asset__c,CurrentContract__r.Contract_End_Date__c,CurrentContract__r.Contract_Conclusion_Date__c,Product2.Category4__c,Product2.ServiceCategory__c,Product2.Category3__c from Asset'
+                +' where Hospital__c in :hospIds and Product2.ServiceCategory__c != null and Status != \'寤冩\' and Status != \'寰呮姤搴焅''
+                +' and IF_Parts_production__c != \'1\' and SerMarGuranteeType__c = null and (Extend_Gurantee_DateTo__c = null or Extend_Gurantee_DateTo__c < :egdTime) order by hospital__c';
         return Database.getQueryLocator(query);
     }
 
     global void execute(Database.BatchableContext BC, list<Asset> Assets) {
-       
-        List<Account_Service_Of_Target__c> asots = new List<Account_Service_Of_Target__c>();
+        system.debug('鎵цexecute');
+        List<Account_Service_Of_Target__c> asots = new List<Account_Service_Of_Target__c>(); 
         // List<Account_Service_Of_Target__c> asotsIN = new List<Account_Service_Of_Target__c>();
         List<Id> accIds = new List<Id>();
         Map<String,Account_Service_Of_Target__c> asotMap = new Map<String,Account_Service_Of_Target__c>();
-        for (Asset ass : Assets) {
-            accIds.add(ass.Hospital__c);
+
+        for (Asset ass1 : Assets) {
+            accIds.add(ass1.Hospital__c);
         }
-        List<Account_Service_Of_Target__c> asotList = [select Id,Finish_Rigid_Mirror_2__c,Finish_Rigid_Mirror_3__c,Finish_Correlation_Lightsource__c,Finish_Rigid_Mirror_1__c,Account_HP__c,OCSM_Period_half__c 
+        List<Account> accList = [select id from Account where id in :accIds];
+        for (Account acc : accList) {
+             // 鏍囪鏄惁瑕嗙洊鐜囩洰鏍囧尰闄�
+            acc.IF_Coverage_Target_HP__c = '1';
+        }
+        List<Account_Service_Of_Target__c> asotList = [select Id,Target_Rigid_Mirror_2__c,Target_Soft_Mirror_2__c,Target_Correlation_Lightsource__c,Account_HP__c,OCSM_Period_half__c 
                                                     from Account_Service_Of_Target__c 
                                                     where Account_HP__c in :accIds and OCSM_Period_half__c = :OCSM_Period_half 
                                                     and OCSM_Period__c = :OCSM_Period];
@@ -64,69 +87,61 @@
                     }
                 }
             }
-        }   
-            
-            
-            List<Asset> AssetsReal = new List<Asset>();
+        }
+            List<Asset> AssetsTarget = new List<Asset>();
             for (Asset ass1 : Assets) {
-                // 瀹為檯瑕嗙洊鏁帮紙纭級锛氭硨灏跨鐢ㄧ‖鎬ч暅
-                Integer mirror_4 = 0;
-                // 瀹為檯瑕嗙洊鏁帮紙纭級锛氬绉戠敤纭�ч暅
-                Integer mirror_5 = 0;
-                // 瀹為檯瑕嗙洊鏁帮紙鍛ㄨ竟锛夛細鍏夋簮
-                Integer mirror_6 = 0;
-                // 瀹為檯瑕嗙洊鏁帮紙杞級锛氱數瀛愰暅
-                Integer mirror_7 = 0;
-                // 鏍囪鏄惁瑕嗙洊鐜囧疄闄呰澶�
-                ass1.IF_Coverage_Real_Asset__c = '1';
-                AssetsReal.add(ass1);
-                if (ass1.Product2.Category4__c == '娉屽翱绉戠敤纭�ч暅') {
-                    mirror_4++;
+                // 瑕嗙洊鐩爣锛堢‖锛�
+                Integer mirror_1 = 0;
+                // 瑕嗙洊鐩爣锛堣蒋锛�
+                Integer mirror_2 = 0;
+                //瑕嗙洊鐩爣锛堝懆杈癸級
+                Integer mirror_3 = 0;
+                // 鏍囪鏄惁瑕嗙洊鐜囩洰鏍囪澶�
+                ass1.IF_Coverage_Target_Asset__c = '1';
+                 AssetsTarget.add(ass1);
+               
+                if (ass1.Product2.ServiceCategory__c == '纭�ч暅') {
+                    mirror_1++;
                 }
-                if (ass1.Product2.Category4__c == '濡囩鐢ㄧ‖鎬ч暅') {
-                    mirror_5++;
+                if(ass1.Product2.ServiceCategory__c =='杞�ч暅'){
+                    mirror_2++;
                 }
-                if (ass1.Product2.Category3__c == '鍏夋簮') {
-                    mirror_6++;
-                }
-                if (ass1.Product2.ServiceCategory__c =='杞�ч暅') {
-                    mirror_7++;
-                }
-                if (asotMap.containsKey(ass1.hospital__c)) {
-                    Account_Service_Of_Target__c asotOne = new Account_Service_Of_Target__c();
-                    asotOne = asotMap.get(ass1.hospital__c);
-                    asotOne.Finish_Rigid_Mirror_2__c += mirror_4;
-                    asotOne.Finish_Rigid_Mirror_3__c += mirror_5;
-                    asotOne.Finish_Correlation_Lightsource__c += mirror_6;
-                    asotOne.Finish_Rigid_Mirror_1__c += mirror_7;
+                if (ass1.Product2.ServiceCategory__c == '鍛ㄨ竟') {
+                    mirror_3++;
+                }   
+                if (asotMap.containsKey(ass1.Hospital__c)) {
+                    Account_Service_Of_Target__c asotOne = asotMap.get(ass1.Hospital__c);
+                    system.debug('asotOne=='+ asotOne);
+                    asotOne.Coverage_Target_Account__c = true;
+                    asotOne.Target_Rigid_Mirror_2__c += mirror_1;
+                    asotOne.Target_Soft_Mirror_2__c += mirror_2;
+                    asotOne.Target_Correlation_Lightsource__c += mirror_3;
                     if (!asots.contains(asotOne)) {
                         asots.add(asotOne);
                     }
                 }else{
                     Account_Service_Of_Target__c asot1 = new Account_Service_Of_Target__c();
-                    asot1.Account_HP__c = ass1.hospital__c;
-                    asot1.Finish_Rigid_Mirror_2__c = mirror_4;
-                    asot1.Finish_Rigid_Mirror_3__c = mirror_5;
-                    asot1.Finish_Correlation_Lightsource__c = mirror_6;
-                    asot1.Finish_Rigid_Mirror_1__c = mirror_7;
-                    asot1.OCSM_Period__c =  OCSM_Period;
-                    asot1.OCSM_Period_half__c = OCSM_Period_half; 
+                    asot1.Account_HP__c = ass1.Hospital__c;
+                    asot1.Coverage_Target_Account__c = true;
+                    asot1.Target_Rigid_Mirror_2__c = mirror_1;
+                    asot1.Target_Soft_Mirror_2__c = mirror_2;
+                    asot1.Target_Correlation_Lightsource__c = mirror_3;
+                    asot1.OCSM_Period__c = OCSM_Period; 
+                    asot1.OCSM_Period_half__c = OCSM_Period_half;
                     asotMap.put(ass1.hospital__c,asot1);
                     if (!asots.contains(asot1)) {
                         asots.add(asot1);
-                    }  
+                    } 
                 }
             }
-            upsert asots;
-        system.debug('杩欎釜闆嗗悎锛欰ssetsReal ==='+AssetsReal);
-        if (AssetsReal!=null) {
-            try {
-                update AssetsReal;
-            }
-            catch (Exception e) {
-                iflog.ErrorLog__c += 'ERROR'+'['+'update AssetsReal:'+']'+e.getMessage()+'\n';
-             }
-        }  
+            UpSert asots;
+            Oly_TriggerHandler.bypass('AssetTrigger');
+            system.debug('鎵цupdate AssetsTarget鍓�');
+            update AssetsTarget;  
+            system.debug('鎵цupdate accList鍓�'); 
+            Oly_TriggerHandler.bypass('AccountTrigger');
+            update accList;  
+
     }
 
     global void finish(Database.BatchableContext BC) {
diff --git a/force-app/main/default/classes/EquipmentRealCoverageRealBatch.cls b/force-app/main/default/classes/EquipmentRealCoverageRealBatch.cls
index 22f77b2..1a8f72f 100644
--- a/force-app/main/default/classes/EquipmentRealCoverageRealBatch.cls
+++ b/force-app/main/default/classes/EquipmentRealCoverageRealBatch.cls
@@ -2,20 +2,27 @@
 @Author: 榛勫崈榫�
 @Name: EquipmentCoverageTargetBatch
 @CreateDate: 22/03/2022
-@Description: 鏄惁瑕嗙洊鐜囩洰鏍囷紙鍒嗘瘝锛�
+@Description: 鏄惁瑕嗙洊鐜囧疄闄咃紙鍒嗗瓙锛�
 @Version 1.0
 *****************************************************************************************************/
-global class EquipmentCoverageTargetBatch implements Database.Batchable<sObject>,Database.Stateful {
+global class EquipmentRealCoverageRealBatch implements Database.Batchable<sObject>,Database.Stateful {
     public String query;
     public Date start_dateH1 ;
     public Date end_dateH1 ;
-    public List<Id> hospIds = new List<Id>();
     public Date toDayTime = Date.today();
+    private BatchIF_Log__c iflog;
     public String OCSM_Period_half;
     public String OCSM_Period = 'FY'+toDayTime.year();
-    private BatchIF_Log__c iflog;
-    global EquipmentCoverageTargetBatch() {
+    public List < String > accountIdList;
+    global EquipmentRealCoverageRealBatch() {
         this.query = query;
+    }
+    global EquipmentRealCoverageRealBatch(List < String > accountIdList) {
+        this.query = query;
+        this.accountIdList = accountIdList;
+    }
+    global Database.QueryLocator start(Database.BatchableContext bc) {
+         system.debug('鎵цstart');
         iflog = new BatchIF_Log__c();
         iflog.Type__c = 'PushNotification';
         iflog.Log__c  = 'EquipmentRealCoverageBatch start\n';
@@ -26,42 +33,37 @@
         }else{
             OCSM_Period_half = '2H';
         }
-      
-
-    }
-
-    global Database.QueryLocator start(Database.BatchableContext bc) {
-        // query = 'select Id,(select id,IF_Coverage_Target_Asset__c,IF_Coverage_Real_Asset__c,CurrentContract__r.Contract_End_Date__c,CurrentContract__r.Contract_Conclusion_Date__c,Product2.Category4__c,Product2.ServiceCategory__c,Product2.Category3__c from Asset_Hospital__r where Status != \'寤冩\' and Status != \'寰呮姤搴焅''
-        //              +' and IF_Parts_production__c != \'1\''
-        //              +' and ((SerMarGuranteeType__c != \'鏈嶅姟澶氬勾淇濅慨\' and SerMarGuranteeType__c != \'甯傚満澶氬勾淇濅慨\') or Extend_Gurantee_DateTo__c >= :egdTime)'
-        //              +' and Product2.ServiceCategory__c != null) from Account where id in :hospIds';
-        system.debug('鎵цstart');
-        query = 'select Id,Hospital__c,IF_Coverage_Target_Asset__c,IF_Coverage_Real_Asset__c,CurrentContract__r.Contract_End_Date__c,CurrentContract__r.Contract_Conclusion_Date__c,Product2.Category4__c,Product2.ServiceCategory__c,Product2.Category3__c from Asset'
-                +' where Hospital__c in :hospIds and Product2.ServiceCategory__c != null and Status != \'寤冩\' and Status != \'寰呮姤搴焅' and CurrentContract__c != null'
-                +' and IF_Parts_production__c != \'1\' and SerMarGuranteeType__c = null and (Extend_Gurantee_DateTo__c = null or Extend_Gurantee_DateTo__c < :egdTime) order by hospital__c';
-
-        // 5鏉′互涓婅蒋鎬ч暅鍖婚櫌&&鍖婚櫌鏈夋晥
-        Date egdTime = Date.newInstance(toDayTime.year()+1,3,1);
-        List<AggregateResult> Asset1 = [select count(Id),Hospital__c from asset where Product2.ServiceCategory__c ='杞�ч暅'  Group by Hospital__c having count(Id)>=5];
-        if(Asset1!=null){
-           for (AggregateResult a1 : Asset1) {
-               hospIds.add(String.valueOf(a1.get('Hospital__c')));
-           }
+        if (accountIdList != null && accountIdList.size() > 0) {
+            query = 'select id,Hospital__c,IF_Coverage_Target_Asset__c,IF_Coverage_Real_Asset__c,CurrentContract__r.Contract_End_Date__c,CurrentContract__r.Contract_Conclusion_Date__c,Product2.Category4__c,Product2.ServiceCategory__c,Product2.Category3__c from Asset where '
+                     +' IF_Parts_production__c != \'1\' and CurrentContract__c != null and Hospital__c in :accountIdList'
+                     +' and (CurrentContract__r.Contract_End_Date__c >= :start_dateH1 and CurrentContract__r.Contract_Conclusion_Date__c <= :end_dateH1) order by hospital__c';
+        }else{
+            query = 'select id,Hospital__c,IF_Coverage_Target_Asset__c,IF_Coverage_Real_Asset__c,CurrentContract__r.Contract_End_Date__c,CurrentContract__r.Contract_Conclusion_Date__c,Product2.Category4__c,Product2.ServiceCategory__c,Product2.Category3__c from Asset where '
+                     +' IF_Parts_production__c != \'1\' and CurrentContract__c != null'
+                     +' and (CurrentContract__r.Contract_End_Date__c >= :start_dateH1 and CurrentContract__r.Contract_Conclusion_Date__c <= :end_dateH1) order by hospital__c';
         }
         
+            // 瀹為檯璁惧鍚堝悓鏃堕棿鍖洪棿1H(4,9);2H(10,3)
+            if (toDayTime.month() >= 4 && toDayTime.month() <= 9) {
+                start_dateH1 = Date.newInstance(toDayTime.year(),9,1);
+                end_dateH1 = Date.newInstance(toDayTime.year(),9,30);
+            }else{
+                start_dateH1 = Date.newInstance(toDayTime.year(),3,1);
+                end_dateH1 = Date.newInstance(toDayTime.year()+1,3,31);
+            }
         return Database.getQueryLocator(query);
     }
 
     global void execute(Database.BatchableContext BC, list<Asset> Assets) {
+       
         List<Account_Service_Of_Target__c> asots = new List<Account_Service_Of_Target__c>();
         // List<Account_Service_Of_Target__c> asotsIN = new List<Account_Service_Of_Target__c>();
         List<Id> accIds = new List<Id>();
         Map<String,Account_Service_Of_Target__c> asotMap = new Map<String,Account_Service_Of_Target__c>();
-
-        for (Asset ass1 : Assets) {
-            accIds.add(ass1.Hospital__c);
+        for (Asset ass : Assets) {
+            accIds.add(ass.Hospital__c);
         }
-        List<Account_Service_Of_Target__c> asotList = [select Id,Target_Rigid_Mirror_2__c,Target_Soft_Mirror_2__c,Target_Correlation_Lightsource__c,Account_HP__c,OCSM_Period_half__c 
+        List<Account_Service_Of_Target__c> asotList = [select Id,Finish_Rigid_Mirror_2__c,Finish_Rigid_Mirror_3__c,Finish_Correlation_Lightsource__c,Finish_Rigid_Mirror_1__c,Account_HP__c,OCSM_Period_half__c 
                                                     from Account_Service_Of_Target__c 
                                                     where Account_HP__c in :accIds and OCSM_Period_half__c = :OCSM_Period_half 
                                                     and OCSM_Period__c = :OCSM_Period];
@@ -73,65 +75,63 @@
                     }
                 }
             }
-        }
-            List<Asset> AssetsTarget = new List<Asset>();
+        }   
+            
+            
+            List<Asset> AssetsReal = new List<Asset>();
             for (Asset ass1 : Assets) {
-                // 瑕嗙洊鐩爣锛堢‖锛夛細娉屽翱绉戠敤纭�ч暅
-                Integer mirror_1 = 0;
-                // 瑕嗙洊鐩爣锛堣蒋锛夛細榧诲捊鍠夐暅
-                Integer mirror_2 = 0;
-                //瑕嗙洊鐩爣锛堝懆杈癸級锛氬厜婧�
-                Integer mirror_3 = 0;
-                // 鏍囪鏄惁瑕嗙洊鐜囩洰鏍囪澶�
-                ass1.IF_Coverage_Target_Asset__c = '1';
-                 AssetsTarget.add(ass1);
-               
-                if (ass1.Product2.Category4__c == '娉屽翱绉戠敤纭�ч暅') {
-                    mirror_1++;
+                // 瀹為檯瑕嗙洊鏁帮紙纭級
+                Integer mirror_4 = 0;
+                
+                // 瀹為檯瑕嗙洊鏁帮紙鍛ㄨ竟锛�
+                Integer mirror_6 = 0;
+                // 瀹為檯瑕嗙洊鏁帮紙杞級
+                Integer mirror_7 = 0;
+                // 鏍囪鏄惁瑕嗙洊鐜囧疄闄呰澶�
+                ass1.IF_Coverage_Real_Asset__c = '1';
+                AssetsReal.add(ass1);
+                if (ass1.Product2.ServiceCategory__c == '纭�ч暅') {
+                    mirror_4++;
                 }
-                if(ass1.Product2.ServiceCategory__c =='杞�ч暅'){
-                    mirror_2++;
+                if (ass1.Product2.ServiceCategory__c == '鍛ㄨ竟') {
+                    mirror_6++;
                 }
-                if (ass1.Product2.Category3__c == '鍏夋簮') {
-                    mirror_3++;
-                }   
-                if (asotMap.containsKey(ass1.Hospital__c)) {
-                    Account_Service_Of_Target__c asotOne = asotMap.get(ass1.Hospital__c);
-                    system.debug('asotOne=='+ asotOne);
-                    asotOne.Coverage_Target_Account__c = true;
-                    asotOne.Target_Rigid_Mirror_2__c += mirror_1;
-                    asotOne.Target_Soft_Mirror_2__c += mirror_2;
-                    asotOne.Target_Correlation_Lightsource__c += mirror_3;
+                if (ass1.Product2.ServiceCategory__c =='杞�ч暅') {
+                    mirror_7++;
+                }
+                if (asotMap.containsKey(ass1.hospital__c)) {
+                    Account_Service_Of_Target__c asotOne = new Account_Service_Of_Target__c();
+                    asotOne = asotMap.get(ass1.hospital__c);
+                    asotOne.Finish_Rigid_Mirror_2__c += mirror_4;
+                    asotOne.Finish_Correlation_Lightsource__c += mirror_6;
+                    asotOne.Finish_Rigid_Mirror_1__c += mirror_7;
                     if (!asots.contains(asotOne)) {
                         asots.add(asotOne);
                     }
                 }else{
                     Account_Service_Of_Target__c asot1 = new Account_Service_Of_Target__c();
-                    asot1.Account_HP__c = ass1.Hospital__c;
-                    asot1.Coverage_Target_Account__c = true;
-                    asot1.Target_Rigid_Mirror_2__c = mirror_1;
-                    asot1.Target_Soft_Mirror_2__c = mirror_2;
-                    asot1.Target_Correlation_Lightsource__c = mirror_3;
-                    asot1.OCSM_Period__c = OCSM_Period; 
-                    asot1.OCSM_Period_half__c = OCSM_Period_half;
+                    asot1.Account_HP__c = ass1.hospital__c;
+                    asot1.Finish_Rigid_Mirror_2__c = mirror_4;
+                    asot1.Finish_Correlation_Lightsource__c = mirror_6;
+                    asot1.Finish_Rigid_Mirror_1__c = mirror_7;
+                    asot1.OCSM_Period__c =  OCSM_Period;
+                    asot1.OCSM_Period_half__c = OCSM_Period_half; 
                     asotMap.put(ass1.hospital__c,asot1);
                     if (!asots.contains(asot1)) {
                         asots.add(asot1);
-                    } 
+                    }  
                 }
             }
-            UpSert asots;
-        if (AssetsTarget!=null) {
-                    try {
-                        system.debug('鎵цupdate');
-                        Oly_TriggerHandler.bypass('AssetTrigger');
-                        update AssetsTarget;
-                    }
-                    catch (Exception e) {
-                        iflog.ErrorLog__c += 'ERROR'+'['+'update AssetsTarget:'+']'+e.getMessage()+'\n';
-                     }
-        }
-                
+            upsert asots;
+        system.debug('杩欎釜闆嗗悎锛欰ssetsReal ==='+AssetsReal);
+        if (AssetsReal!=null) {
+            try {
+                update AssetsReal;
+            }
+            catch (Exception e) {
+                iflog.ErrorLog__c += 'ERROR'+'['+'update AssetsReal:'+']'+e.getMessage()+'\n';
+             }
+        }  
     }
 
     global void finish(Database.BatchableContext BC) {
diff --git a/force-app/main/default/classes/EquipmentRenewMoleculeBatch.cls b/force-app/main/default/classes/EquipmentRenewMoleculeBatch.cls
index 962b563..f5c1f1d 100644
--- a/force-app/main/default/classes/EquipmentRenewMoleculeBatch.cls
+++ b/force-app/main/default/classes/EquipmentRenewMoleculeBatch.cls
@@ -1,72 +1,133 @@
+/**************************************************************************************************
+@Author: 榛勫崈榫�
+@Name: EquipmentCoverageTargetBatch
+@CreateDate: 22/03/2022
+@Description: 鏄惁缁鐜囧疄闄咃紙鍒嗗瓙锛�
+@Version 1.0
+*****************************************************************************************************/
 global class EquipmentRenewMoleculeBatch implements Database.Batchable<sObject>,Database.Stateful {
     public String query;
     public Date toDayTime = Date.today();
     private BatchIF_Log__c iflog;
+    public String OCSM_Period_half;
+    public String OCSM_Period = 'FY'+toDayTime.year();
+    public Date effectiveTime;
+    public List < String > accountIdList;
     global EquipmentRenewMoleculeBatch() {
         this.query = query;
+    }
+    global EquipmentRenewMoleculeBatch(List < String > accountIdList) {
+        this.query = query;
+        this.accountIdList = accountIdList;
+    }
+    global Database.QueryLocator start(Database.BatchableContext bc) {
         iflog = new BatchIF_Log__c();
         iflog.Type__c = 'PushNotification';
         iflog.Log__c  = 'EquipmentRenewMoleculeBatch start\n';
         iflog.ErrorLog__c = '';
         insert iflog;
-    }
-
-    global Database.QueryLocator start(Database.BatchableContext bc) {
-        // 淇濇湁璁惧涓嶄负闆朵欢鍋滀骇
-        query+='select Id,(select Id,CurrentContract_F__r.IF_Target_Renew__c,CurrentContract__c,CurrentContract__r.Contract_Conclusion_Date__c,CurrentContract__r.New_Contract_TypeF_Text__c,Product2.ServiceCategory__c,Product2.Category3__c,Product2.Category4__c from Asset_Hospital__r where IF_Parts_production__c != \'1\' ) from Account';
+        if (toDayTime.month() >= 4 && toDayTime.month() <= 9) {
+            OCSM_Period_half = '1H';
+            effectiveTime = Date.newInstance(toDayTime.year(),9,30);
+        }else{
+            OCSM_Period_half = '2H';
+            effectiveTime = Date.newInstance(toDayTime.year()+1,3,31);
+        }
+        if (accountIdList != null && accountIdList.size() > 0) {
+            // 淇濇湁璁惧涓嶄负闆朵欢鍋滀骇
+        query = 'select Id,Hospital__c,CurrentContract__c,CurrentContract__r.Contract_Conclusion_Date__c,CurrentContract__r.New_Contract_TypeF_Text__c,Product2.ServiceCategory__c,Product2.Category3__c,Product2.Category4__c'
+                +' from Asset where Hospital__c in :accountIdList and IF_Parts_production__c != \'1\' and CurrentContract__r.New_Contract_TypeF_Text__c =\'缁鍚堝悓\''
+                +' and CurrentContract__r.Contract_Conclusion_Date__c <= :effectiveTime order by hospital__c';
+        }else{
+            // 淇濇湁璁惧涓嶄负闆朵欢鍋滀骇
+        query = 'select Id,Hospital__c,CurrentContract__c,CurrentContract__r.Contract_Conclusion_Date__c,CurrentContract__r.New_Contract_TypeF_Text__c,Product2.ServiceCategory__c,Product2.Category3__c,Product2.Category4__c'
+                +' from Asset where IF_Parts_production__c != \'1\' and CurrentContract__r.New_Contract_TypeF_Text__c =\'缁鍚堝悓\''
+                +' and CurrentContract__r.Contract_Conclusion_Date__c <= :effectiveTime order by hospital__c';
+        }
         return Database.getQueryLocator(query);
     }   
 
-    global void execute(Database.BatchableContext BC, list<Account> Accounts) {
+    global void execute(Database.BatchableContext BC, list<Asset> Assets) {
 
         List<Account_Service_Of_Target__c> asots = new List<Account_Service_Of_Target__c>();
         List<Id> accIds = new List<Id>();
         Map<String,Account_Service_Of_Target__c> asotMap = new Map<String,Account_Service_Of_Target__c>();
-        for (Account acc1 : Accounts) {
-            accIds.add(acc1.id);
+        for (Asset ass1 : Assets) {
+            accIds.add(ass1.Hospital__c);
         }
-        List<Account_Service_Of_Target__c> asotList = [select Id,Account_HP__c,OCSM_Period_half__c from Account_Service_Of_Target__c where Account_HP__c in :accIds];
+        List<Account_Service_Of_Target__c> asotList = [select Id,Renew_Finish_Rigid_Mirror_1__c,Renew_Finish_Rigid_Mirror_2__c,Renew_Finish_Rigid_Mirror_3__c,Renew_Finish_Correlation_Lightsource__c,Renew_Finish_Else__c,Account_HP__c,OCSM_Period_half__c 
+                                                    from Account_Service_Of_Target__c 
+                                                    where Account_HP__c in :accIds and OCSM_Period_half__c = :OCSM_Period_half 
+                                                    and OCSM_Period__c = :OCSM_Period];
+
         if (asotList != null) {
             for (Account_Service_Of_Target__c asot : asotList) {
                 for (Id accid : accIds) {
                     if (asot.Account_HP__c == accid) {
-                        asotMap.put(accid+asot.OCSM_Period_half__c,asot);
+                        asotMap.put(accid,asot);
                     }
                 }
             }
         }
-
-        for (Account acc : Accounts) {
-            Account_Service_Of_Target__c asot = new Account_Service_Of_Target__c();
             List<Asset> AssetsReal = new List<Asset>();
-            // 瀹為檯缁鏁帮紙纭級锛氭硨灏跨鐢ㄧ‖鎬ч暅
-            Integer mirror_4 = 0;
-            // 瀹為檯缁鏁帮紙纭級锛氬绉戠敤纭�ч暅
-            Integer mirror_5 = 0;
-            // 瀹為檯缁鏁帮紙鍛ㄨ竟锛夛細鍏夋簮
-            Integer mirror_6 = 0;
-            // 瀹為檯缁鏁帮紙杞級锛氱數瀛愰暅
-            Integer mirror_7 = 0;
-            for ( Asset ass : acc.Asset_Hospital__r ) {
+            
+            for ( Asset ass :  Assets) {
+                
+                // 瀹為檯缁鏁帮紙纭級
+                Integer mirror_5 = 0;
+                // 瀹為檯缁鏁帮紙鍛ㄨ竟锛�
+                Integer mirror_6 = 0;
+                // 瀹為檯缁鏁帮紙杞級
+                Integer mirror_7 = 0;
+                // 瀹為檯缁鏁�(鍏朵粬)
+                Integer mirror_8 = 0;
                 // 鍒嗗瓙
-                // 1. 璁惧鍏宠仈鐨勫悎鍚岀被鍨嬫槸鈥滅画绛惧悎鍚屸�濓紝涓斾笂鏈熷悎鍚屽睘浜庣画绛剧洰鏍囨竻鍗曞唴--鍥炲鍐呭锛氫笂鏈熷悎鍚岀画绛剧洰鏍囩殑娓呭崟鐢卞鎴锋彁渚�
-                if (ass.CurrentContract_F__r.IF_Target_Renew__c == '1' && ass.CurrentContract__r.New_Contract_TypeF_Text__c == '缁鍚堝悓') {
+                // 1. 璁惧鍏宠仈鐨勫悎鍚岀被鍨嬫槸鈥滅画绛惧悎鍚屸�濓紝
                     // 2. 鍦�2023骞�3鏈�31鏃ュ墠绯荤粺鐢熸晥瀹屾瘯锛�2023骞�3鏈�31鏃ユ槸2H锛�1H鏄寚2022骞�9鏈�30鏃ワ紝
-                    if (toDayTime.month() >= 4 && toDayTime.month() <= 9) {
-                        if (ass.CurrentContract__r.Contract_Conclusion_Date__c <= Date.newInstance(toDayTime.year(),9,30)) {
-                                    // 鏍囪涓烘槸鍚︾画绛惧疄闄呰澶�
-                            ass.IF_Renewalrate_Real_Asset__c = '1';
-                            AssetsReal.add(ass);
-                        }
-                    }else{
-                       if (ass.CurrentContract__r.Contract_Conclusion_Date__c <= Date.newInstance(toDayTime.year()+1,3,31)) {
-                            ass.IF_Renewalrate_Real_Asset__c = '1';
-                            AssetsReal.add(ass);
-                       }
+                    // 鏍囪涓烘槸鍚︾画绛惧疄闄呰澶�
+                    ass.IF_Renewalrate_Real_Asset__c = '1';
+                    AssetsReal.add(ass); 
+
+                    
+                    if (ass.Product2.ServiceCategory__c == '纭�ч暅') {
+                        mirror_5++;
                     }
+                    if (ass.Product2.ServiceCategory__c == '鍛ㄨ竟') {
+                        mirror_6++;
+                    }
+                    if (ass.Product2.ServiceCategory__c =='杞�ч暅') {
+                        mirror_7++;
+                    }
+                    if (ass.Product2.ServiceCategory__c == null) {
+                        mirror_8++;
+                    }
+            
+                if (asotMap.containsKey(ass.Hospital__c)) {
+                    Account_Service_Of_Target__c asotOne = new Account_Service_Of_Target__c();
+                        asotOne = asotMap.get(ass.Hospital__c);
+                        asotOne.Renew_Finish_Rigid_Mirror_3__c += mirror_5;
+                        asotOne.Renew_Finish_Correlation_Lightsource__c += mirror_6;
+                        asotOne.Renew_Finish_Rigid_Mirror_1__c += mirror_7;
+                        asotOne.Renew_Finish_Else__c += mirror_8;
+                        if (!asots.contains(asotOne)) {
+                            asots.add(asotOne);
+                        } 
+                }else{
+                    Account_Service_Of_Target__c asot1 = new Account_Service_Of_Target__c();
+                    asot1.Account_HP__c = ass.Hospital__c;
+                    asot1.Renew_Finish_Rigid_Mirror_3__c = mirror_5;
+                    asot1.Renew_Finish_Correlation_Lightsource__c = mirror_6;
+                    asot1.Renew_Finish_Rigid_Mirror_1__c = mirror_7;
+                    asot1.Renew_Finish_Else__c = mirror_8;
+                    asot1.OCSM_Period__c = OCSM_Period; 
+                    asot1.OCSM_Period_half__c = OCSM_Period_half;
+                    asotMap.put(ass.hospital__c,asot1);
+                    if (!asots.contains(asot1)) {
+                            asots.add(asot1);
+                        }
                 }
-            }
-            if (AssetsReal!=null) {
+            }   
+        if (AssetsReal!=null) {
                     try {
                         update AssetsReal;
                     }
@@ -74,53 +135,6 @@
                         iflog.ErrorLog__c += 'ERROR'+'['+'update AssetsReal:'+']'+e.getMessage()+'\n';
                      }
             }
-            for (Asset AtoHp: AssetsReal) {
-                    if (AtoHp.Product2.Category4__c == '娉屽翱绉戠敤纭�ч暅') {
-                        mirror_4++;
-                    }
-                    if (AtoHp.Product2.Category4__c == '濡囩鐢ㄧ‖鎬ч暅') {
-                        mirror_5++;
-                    }
-                    if (AtoHp.Product2.Category3__c == '鍏夋簮') {
-                        mirror_6++;
-                    }
-                    if (AtoHp.Product2.ServiceCategory__c =='杞�ч暅') {
-                        mirror_7++;
-                    }
-            }
-            if (asotMap != null) {
-                Account_Service_Of_Target__c asotOne = new Account_Service_Of_Target__c();
-                if (toDayTime.month() >= 4 && toDayTime.month() <= 9) {
-                    asotOne = asotMap.get(acc.id+'1H');
-                }else{
-                    asotOne = asotMap.get(acc.id+'2H'); 
-                }
-                if (asotOne != null) {
-                    asotOne.Renew_Finish_Rigid_Mirror_2__c = mirror_4;
-                    asotOne.Renew_Finish_Rigid_Mirror_3__c = mirror_5;
-                    asotOne.Renew_Finish_Correlation_Lightsource__c = mirror_6;
-                    asotOne.Renew_Finish_Rigid_Mirror_1__c = mirror_7;
-                    asots.add(asotOne);
-                }  
-            }
-            if (asotList.isEmpty()) {
-                Account_Service_Of_Target__c asot1 = new Account_Service_Of_Target__c();
-                asot1.Account_HP__c = acc.id;
-                asot1.Renew_Finish_Rigid_Mirror_2__c = mirror_4;
-                asot1.Renew_Finish_Rigid_Mirror_3__c = mirror_5;
-                asot1.Renew_Finish_Correlation_Lightsource__c = mirror_6;
-                asot1.Renew_Finish_Rigid_Mirror_1__c = mirror_7;
-                if (toDayTime.year()<=2029 && toDayTime.year()>=2023) {
-                    asot1.OCSM_Period__c =  'FY'+toDayTime.year();
-                    if (toDayTime.month() >= 4 && toDayTime.month() <= 9) {
-                        asot1.OCSM_Period_half__c =  '1H';
-                    }else{
-                        asot1.OCSM_Period_half__c =  '2H';
-                    } 
-                }
-                asots.add(asot1);
-            }
-        }
         if (asots!=null) {
                 try {
                     UpSert asots;
diff --git a/force-app/main/default/classes/EquipmentRenewTargetBatch.cls b/force-app/main/default/classes/EquipmentRenewTargetBatch.cls
index 8f8ebcd..aa26b3b 100644
--- a/force-app/main/default/classes/EquipmentRenewTargetBatch.cls
+++ b/force-app/main/default/classes/EquipmentRenewTargetBatch.cls
@@ -1,4 +1,11 @@
-global class EquipmentRenewTargetBatch implements Database.Batchable<sObject> {
+/**************************************************************************************************
+@Author: 榛勫崈榫�
+@Name: EquipmentCoverageTargetBatch
+@CreateDate: 22/03/2022
+@Description: 鏄惁缁鐜囩洰鏍囷紙鍒嗘瘝锛�
+@Version 1.0
+*****************************************************************************************************/
+global class EquipmentRenewTargetBatch implements Database.Batchable<sObject>,Database.Stateful {
     public String query;
     public Date toDayTime = Date.today();
     public Date start_date1 ;
@@ -6,143 +13,160 @@
     public Date start_date2 ;
     public Date end_date2 ;
     public Date deadlineTime;
+    public String OCSM_Period_half;
+    public String OCSM_Period = 'FY'+toDayTime.year();
     private BatchIF_Log__c iflog;
+    public List < String > accountIdList;
     global EquipmentRenewTargetBatch() {
         this.query = query;
+        
+    }
+    global EquipmentRenewTargetBatch(List < String > accountIdList) {
+        this.query = query;
+        this.accountIdList = accountIdList;
+    }
+    global Database.QueryLocator start(Database.BatchableContext bc) {
         iflog = new BatchIF_Log__c();
         iflog.Type__c = 'PushNotification';
         iflog.Log__c  = 'EquipmentRenewTargetBatch start\n';
         iflog.ErrorLog__c = '';
         insert iflog;
-    }
-
-    global Database.QueryLocator start(Database.BatchableContext bc) {
         if (toDayTime.month() >= 4 && toDayTime.month() <= 9) {
-            this.start_date1 = Date.newInstance(toDayTime.year()-1,4,1);
-            this.end_date1 = Date.newInstance(toDayTime.year()-1,12,31);
-            this.start_date2 = Date.newInstance(toDayTime.year(),1,1);
-            this.end_date2 = Date.newInstance(toDayTime.year(),6,30);
-            this.deadlineTime = Date.newInstance(toDayTime.year(),3,31);
+            OCSM_Period_half = '1H';
         }else{
-            this.start_date1 = Date.newInstance(toDayTime.year()-1,10,1);
-            this.end_date1 = Date.newInstance(toDayTime.year(),6,30);
-            this.start_date2 = Date.newInstance(toDayTime.year(),7,1);
-            this.end_date2 = Date.newInstance(toDayTime.year(),12,31);
-            this.deadlineTime = Date.newInstance(toDayTime.year(),9,30);
+            OCSM_Period_half = '2H';
         }
-        // 淇濇湁璁惧涓嶄负闆朵欢鍋滀骇
-        query+='select Id,(select Id,CurrentContract__c,CurrentContract__r.Contract_End_Date__c,CurrentContract__r.Contract_Start_Date__c,Product2.ServiceCategory__c,CurrentContract__r.Status__c,Product2.Category3__c,Product2.Category4__c' 
-                + ' from Asset_Hospital__r where IF_Parts_production__c != \'1\' and (CurrentContract__r.Contract_End_Date__c >= :start_date1 and CurrentContract__r.Contract_End_Date__c <= :end_date2))'
-                + ' from Account';
+        if (toDayTime.month() >= 4 && toDayTime.month() <= 9) {
+            start_date1 = Date.newInstance(toDayTime.year()-1,4,1);
+            end_date1 = Date.newInstance(toDayTime.year()-1,12,31);
+            start_date2 = Date.newInstance(toDayTime.year(),1,1);
+            end_date2 = Date.newInstance(toDayTime.year(),6,30);
+            deadlineTime = Date.newInstance(toDayTime.year(),3,31);
+        }else{
+            start_date1 = Date.newInstance(toDayTime.year()-1,10,1);
+            end_date1 = Date.newInstance(toDayTime.year(),6,30);
+            start_date2 = Date.newInstance(toDayTime.year(),7,1);
+            end_date2 = Date.newInstance(toDayTime.year(),12,31);
+            deadlineTime = Date.newInstance(toDayTime.year(),9,30);
+        }
+        if (accountIdList != null && accountIdList.size() > 0) {
+            // 淇濇湁璁惧涓嶄负闆朵欢鍋滀骇
+            query ='select Id,Hospital__c,CurrentContract_F__r.IF_Target_Renew__c,CurrentContract__c,CurrentContract__r.Contract_End_Date__c,CurrentContract__r.Contract_Start_Date__c,Product2.ServiceCategory__c,CurrentContract__r.Status__c,Product2.Category3__c,Product2.Category4__c' 
+                    + ' from Asset where IF_Parts_production__c != \'1\' and Hospital__c in :accountIdList  and Product2.ServiceCategory__c != null'
+                    // 娴嬭瘯涓嶅紑鍚�
+                    +' and CurrentContract_F__r.IF_Target_Renew__c = \'1\''
+                    + ' and ((CurrentContract__r.Contract_End_Date__c>= :start_date1 and CurrentContract__r.Contract_End_Date__c<= :end_date1) '
+                    +' or (CurrentContract__r.Contract_End_Date__c>= :start_date2 and CurrentContract__r.Contract_End_Date__c<= :end_date2)) order by hospital__c';
+        }else{
+            // 淇濇湁璁惧涓嶄负闆朵欢鍋滀骇
+        query ='select Id,Hospital__c,CurrentContract_F__r.IF_Target_Renew__c,CurrentContract__c,CurrentContract__r.Contract_End_Date__c,CurrentContract__r.Contract_Start_Date__c,Product2.ServiceCategory__c,CurrentContract__r.Status__c,Product2.Category3__c,Product2.Category4__c' 
+                + ' from Asset where IF_Parts_production__c != \'1\' and Product2.ServiceCategory__c != null '
+                // 娴嬭瘯涓嶅紑鍚�
+                +' and CurrentContract_F__r.IF_Target_Renew__c = \'1\''
+                + ' and ((CurrentContract__r.Contract_End_Date__c>= :start_date1 and CurrentContract__r.Contract_End_Date__c<= :end_date1) '
+                +' or (CurrentContract__r.Contract_End_Date__c>= :start_date2 and CurrentContract__r.Contract_End_Date__c<= :end_date2)) order by hospital__c';
+        }  
         return Database.getQueryLocator(query);
     }
 
-    global void execute(Database.BatchableContext BC, list<Account> Accounts) {
+    global void execute(Database.BatchableContext BC, list<Asset> Assets) {
         List<Account_Service_Of_Target__c> asots = new List<Account_Service_Of_Target__c>();
         List<Id> accIds = new List<Id>();
         Map<String,Account_Service_Of_Target__c> asotMap = new Map<String,Account_Service_Of_Target__c>();
-        for (Account acc1 : Accounts) {
-            accIds.add(acc1.id);
+        for (Asset ass : Assets) {
+            accIds.add(ass.Hospital__c);
         }
-        List<Account_Service_Of_Target__c> asotList = [select Id,Account_HP__c,OCSM_Period_half__c from Account_Service_Of_Target__c where Account_HP__c in :accIds];
+        List<Account_Service_Of_Target__c> asotList = [select Id,Renew_Target_Rigid_Mirror_2__c,Renew_Target_Soft_Mirror_2__c,Renew_Target_Correlation_Lightsource__c,Account_HP__c,OCSM_Period_half__c 
+                                                    from Account_Service_Of_Target__c 
+                                                    where Account_HP__c in :accIds and OCSM_Period_half__c = :OCSM_Period_half 
+                                                    and OCSM_Period__c = :OCSM_Period];
         if (asotList != null) {
             for (Account_Service_Of_Target__c asot : asotList) {
                 for (Id accid : accIds) {
                     if (asot.Account_HP__c == accid) {
-                        asotMap.put(accid+asot.OCSM_Period_half__c,asot);
+                        asotMap.put(accid,asot);
                     }
                 }
             }
         }
-        
-        for (Account acc : Accounts) {
-            Account_Service_Of_Target__c asot = new Account_Service_Of_Target__c();
             List<Asset> AssetsTarget = new List<Asset>();
-                // 缁鐩爣锛堢‖锛夛細娉屽翱绉戠敤纭�ч暅
-                Integer mirror_1 = 0;
-                // 缁鐩爣锛堣蒋锛夛細榧诲捊鍠夐暅
-                Integer mirror_2 = 0;
-                //缁鐩爣锛堝懆杈癸級锛氬厜婧�
-                Integer mirror_3 = 0;
+                
 
-            for (Asset ass : acc.Asset_Hospital__r) {
+            for (Asset ass : Assets) {
                     // 鍒嗘瘝
                     /*1H鑰冩牳瀵硅薄锛� 1锛夈��2021.4.1-2021.12.31鍚堝悓缁撴潫涓旀埅姝�2022.3.31鏈画绛剧殑璁惧锛�
                     2锛夈��2022.1.1-2022.6.30鍚堝悓缁撴潫锛屼笉璁鸿璁惧鏄惁缁
                     2H鑰冩牳瀵硅薄锛� 1锛夈��2021.10.1-2022.6.30鍚堝悓缁撴潫涓旀埅姝�2022.9.30鏈画绛剧殑璁惧锛�
                     2锛夈��2022.7.1-2022.12.31 鍚堝悓缁撴潫锛屼笉璁鸿璁惧鏄惁缁
                     */
-                    Boolean result = true;
-                    if (ass.Product2.ServiceCategory__c != null) {
-                        if (ass.CurrentContract__r.Contract_End_Date__c>=start_date1&&ass.CurrentContract__r.Contract_End_Date__c<=end_date1){
-                            if (ass.CurrentContract__c == null || ass.CurrentContract__r.Status__c == '鍚堝悓缁撴潫') {
-                                ass.IF_Renewalrate_Target_Asset__c = '1';
-                                AssetsTarget.add(ass);
-                                result = false;
-                            }
-                            if (result) {
-                                if (ass.CurrentContract__r.Contract_Start_Date__c <= deadlineTime) {
-                                ass.IF_Renewalrate_Target_Asset__c = '1';
-                                AssetsTarget.add(ass);
+                // 缁鐩爣锛堢‖锛�
+                Integer mirror_1 = 0;
+                // 缁鐩爣锛堣蒋锛�
+                Integer mirror_2 = 0;
+                //缁鐩爣锛堝懆杈癸級
+                Integer mirror_3 = 0;
+                        Boolean result = true;
+                        if (ass.Product2.ServiceCategory__c != null) {
+                            if ( ass.CurrentContract__r.Contract_End_Date__c != null && ass.CurrentContract__r.Contract_End_Date__c>=start_date1&&ass.CurrentContract__r.Contract_End_Date__c<=end_date1){
+                                if (ass.CurrentContract__c == null || ass.CurrentContract__r.Status__c == '鍚堝悓缁撴潫') {
+                                    ass.IF_Renewalrate_Target_Asset__c = '1';
+                                    AssetsTarget.add(ass);
+                                    result = false;
                                 }
-                            } 
+                                if (result) {
+                                    if (ass.CurrentContract__r.Contract_Start_Date__c != null && ass.CurrentContract__r.Contract_Start_Date__c <= deadlineTime) {
+                                    ass.IF_Renewalrate_Target_Asset__c = '1';
+                                    AssetsTarget.add(ass);
+                                    }
+                                } 
+                            }
+                            if (ass.CurrentContract__r.Contract_End_Date__c != null && ass.CurrentContract__r.Contract_End_Date__c>=start_date2&&ass.CurrentContract__r.Contract_End_Date__c<=end_date2) {
+                                ass.IF_Renewalrate_Target_Asset__c = '1';
+                                AssetsTarget.add(ass);
+                            }
+                        }   
+                        if (ass.Product2.ServiceCategory__c == '纭�ч暅') {
+                            mirror_1++;
                         }
-                        if (ass.CurrentContract__r.Contract_End_Date__c>=start_date2&&ass.CurrentContract__r.Contract_End_Date__c<=end_date2) {
-                            ass.IF_Renewalrate_Target_Asset__c = '1';
-                            AssetsTarget.add(ass);
+                        if(ass.Product2.ServiceCategory__c =='杞�ч暅'){
+                            mirror_2++;
                         }
-                    }   
-                 if (AssetsTarget!=null) {
-                    try {
-                        update AssetsTarget;
-                    }
-                    catch (Exception e) {
-                        iflog.ErrorLog__c += 'ERROR'+'['+'update AssetsTarget:'+']'+e.getMessage()+'\n';
-                     }
-                }
-            }
-            for (Asset ata : AssetsTarget) {
-                    if (ata.Product2.Category4__c == '娉屽翱绉戠敤纭�ч暅') {
-                        mirror_1++;
-                    }
-                    if(ata.Product2.ServiceCategory__c =='杞�ч暅'){
-                        mirror_2++;
-                    }
-                    if (ata.Product2.Category3__c == '鍏夋簮') {
-                        mirror_3++;
-                    } 
-            }
-            if (asotMap != null) {
-                Account_Service_Of_Target__c asotOne = new Account_Service_Of_Target__c();
-                if (toDayTime.month() >= 4 && toDayTime.month() <= 9) {
-                    asotOne = asotMap.get(acc.id+'1H');
+                        if (ass.Product2.ServiceCategory__c == '鍛ㄨ竟') {
+                            mirror_3++;
+                        } 
+                if (asotMap.containsKey(ass.Hospital__c)) {
+                    Account_Service_Of_Target__c asotOne = new Account_Service_Of_Target__c();
+                        asotOne = asotMap.get(ass.Hospital__c);
+                        asotOne.Renewalrate_Target_Account__c = true;
+                        asotOne.Renew_Target_Rigid_Mirror_2__c += mirror_1;
+                        asotOne.Renew_Target_Soft_Mirror_2__c += mirror_2;
+                        asotOne.Renew_Target_Correlation_Lightsource__c += mirror_3;
+                        if (!asots.contains(asotOne)) {
+                            asots.add(asotOne);
+                        }  
                 }else{
-                    asotOne = asotMap.get(acc.id+'2H'); 
-                }
-                if (asotOne != null) {
-                    asotOne.Renew_Target_Rigid_Mirror_2__c = mirror_1;
-                    asotOne.Renew_Target_Soft_Mirror_2__c = mirror_2;
-                    asotOne.Renew_Target_Correlation_Lightsource__c = mirror_3;
-                    asots.add(asotOne);
-                }  
-            }
-            if (asotList.isEmpty()) {
-                Account_Service_Of_Target__c asot1 = new Account_Service_Of_Target__c();
-                asot1.Account_HP__c = acc.id;
-                asot1.Renew_Target_Rigid_Mirror_2__c = mirror_1;
-                asot1.Renew_Target_Soft_Mirror_2__c = mirror_2;
-                asot1.Renew_Target_Correlation_Lightsource__c = mirror_3;
-                if (toDayTime.year()<=2029 && toDayTime.year()>=2023) {
-                    asot1.OCSM_Period__c =  'FY'+toDayTime.year();
-                    if (toDayTime.month() >= 4 && toDayTime.month() <= 9) {
-                        asot1.OCSM_Period_half__c =  '1H';
-                    }else{
-                        asot1.OCSM_Period_half__c =  '2H';
+                    Account_Service_Of_Target__c asot1 = new Account_Service_Of_Target__c();
+                    asot1.Account_HP__c = ass.Hospital__c;
+                    asot1.Renewalrate_Target_Account__c = true;
+                    asot1.Renew_Target_Rigid_Mirror_2__c = mirror_1;
+                    asot1.Renew_Target_Soft_Mirror_2__c = mirror_2;
+                    asot1.Renew_Target_Correlation_Lightsource__c = mirror_3;
+                    asot1.OCSM_Period__c = OCSM_Period; 
+                    asot1.OCSM_Period_half__c = OCSM_Period_half;
+                    asotMap.put(ass.hospital__c,asot1);
+                    if (!asots.contains(asot1)) {
+                        asots.add(asot1);
                     } 
                 }
-                asots.add(asot1);
             }
-        }  
+        if (AssetsTarget!=null) {
+            try {
+                update AssetsTarget;
+            }
+            catch (Exception e) {
+                iflog.ErrorLog__c += 'ERROR'+'['+'update AssetsTarget:'+']'+e.getMessage()+'\n';
+             }
+        }
         if (asots!=null) {
             try {
                 UpSert asots;

--
Gitblit v1.9.1