diff --git a/cap/applib/ctg.jar b/cap/applib/ctg.jar
index 9a48cd0..fd0db0a 100644
Binary files a/cap/applib/ctg.jar and b/cap/applib/ctg.jar differ
diff --git a/cap/etc/api/SMSPROXY_ITF.XML b/cap/etc/api/SMSPROXY_ITF.XML
index 4b9210c..6c8514e 100644
--- a/cap/etc/api/SMSPROXY_ITF.XML
+++ b/cap/etc/api/SMSPROXY_ITF.XML
@@ -1,25 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Application name="CAP" server="SCAHRO2" timeout="36000">
-    <GetTxnCode>
-        <Item type="xml" value="code"/>
-    </GetTxnCode>
-    <Transaction code="SENDSMS" service="SendSms" desc="短信代理" log_switch="1" timeout="60">
-        <Request>
-            <ReadElement name="status" ETF_name="status" necessary="no"/> <!-- 状态-->
-            <ReadElement name="phoneSplits" ETF_name="phoneSplits" necessary="no"/> <!-- 状态-->
-            <ReadElement name="commonLabels" necessary="no">
-                <ReadElement name="alertname" ETF_name="alertname" necessary="no"/> <!-- 报警名称-->
-            </ReadElement>
+   <GetTxnCode>
+      <Item type="xml" value="code"/>
+   </GetTxnCode>
+   <Transaction code="SENDSMS" service="SendSms" desc="短信代理" log_switch="1" timeout="60">
+      <Request>       
+         <ReadElement name="status" ETF_name="status" necessary="no"/> <!-- 状态-->
+         <ReadElement name="phoneSplits" ETF_name="phoneSplits" necessary="no"/> <!-- 状态-->
+         <ReadElement name="commonLabels" necessary="no">
+            <ReadElement name="alertname" ETF_name="alertname" necessary="no"/> <!-- 报警名称-->
+         </ReadElement>
 
-            <ReadElement name="commonAnnotations" necessary="no">
-                <ReadElement name="summary" ETF_name="summary" necessary="no"/> <!-- 概述-->
-                <ReadElement name="description" ETF_name="text" necessary="no"/> <!-- 概述-->
+         <ReadElement name="commonAnnotations" necessary="no">
+            <ReadElement name="summary" ETF_name="summary" necessary="no"/>
+            <ReadElement name="description" ETF_name="description" necessary="no"/>
+         </ReadElement>
+         <AddItem name="ROOT.text"  value=" "/>      
+         <ReadGroupElement name="alerts" ETF_name="alerts" necessary="no">
+            <ReadElement name="annotations"  necessary="no">
+               <ReadElement name="summary" ETF_name="summary" necessary="no"/>
+               <ReadElement name="description" ETF_name="description" necessary="no"/>
+               <AddItem name="ROOT.text"  expression="STRCAT($description,\r\n,$ROOT.text)" />
             </ReadElement>
-        </Request>
-        <Response>
-            <WriteElement name="Response">
-                <ReadElement name="code" ETF_name="code" value="success" necessary="no"/>
-            </WriteElement>
-        </Response>
-    </Transaction>
+            <ReadElement name="status" ETF_name="status" necessary="no"/>
+         </ReadGroupElement>
+
+      </Request>
+      <Response>
+         <WriteElement name="Response">
+            <WriteElement name="code" ETF_name="code" value="success" necessary="no"/>
+         </WriteElement>
+      </Response>
+   </Transaction>
 </Application>
diff --git a/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML b/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML
index f2ff6e8..8854fff 100644
--- a/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML
+++ b/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML
@@ -6,20 +6,12 @@
         </Attributes>
         <DynSentence name="QryBatLst">
             <Sentence>
-                select dsk_nam from CAPDSKINF where DSK_NAM in
-               (select dsk_nam from (select A.dsk_nam,B.rank from CAPDSKINF A,CAPCUSINF B
-                where A.dsk_nam in (select dsk_nam from
-                (select dsk_nam,sum(unfinished_num) unfinished_num,sum(finish_num) finish_num
-                from (select dsk_nam,(case when BAT_STS not in ('4','2') then 1 else 0 end)
-                unfinished_num ,(case when BAT_STS in ('4','2') then 1 else 0 end) finish_num
-                from CAPBATINF b where b.dsk_nam in
-                (select DSK_NAM from CAPDSKINF a where a.dsk_sts = '1' and ORD_DT &gt;= ? )) group by dsk_nam) c
-                where c.unfinished_num = 0 and c.finish_num &gt; 0 
-                union select DSK_NAM from CAPDSKINF a where a.dsk_sts = '9' and ORD_DT &gt;= ?)
-                AND A.Customer_Id = B.Customer_Id
-                order by rank )
-                where ROWNUM &lt;= '1')
-                FOR UPDATE skip locked
+                select DSK_NAM from capdskinf where DSK_NAM in
+                (select DSK_NAM from capdskinf a where dsk_sts = '1'  and ord_dt &gt;= ?  and (dsk_nam,0) in
+                (select dsk_nam,sum(case when bat_sts not in ('4', '2') then 1 else 0 end) notfinal from capbatinf
+                where ord_dt = a.ord_dt and dsk_nam = a.DSK_NAM group by dsk_nam having sum(case when bat_sts not in ('4', '2') then 1 else 0 end) = 0)
+                union all  select DSK_NAM from CAPDSKINF a where a.dsk_sts = '9' and ORD_DT &gt;= ?)
+                and rownum = 1 for update skip locked
             </Sentence>
             <Fields>DT_BEFER|DT_BEFER|</Fields>
         </DynSentence>
diff --git a/cap/etc/channel/icbc/SCAICBC_ATR.XML b/cap/etc/channel/icbc/SCAICBC_ATR.XML
index 287f6b1..11ceccf 100644
--- a/cap/etc/channel/icbc/SCAICBC_ATR.XML
+++ b/cap/etc/channel/icbc/SCAICBC_ATR.XML
@@ -12,10 +12,12 @@
    <Declare name="itfengine" class="com.hisun.engine.HiEngine">
       <Param name="ITF" value="etc/channel/icbc/SCAICBC_ITF.XML" />
    </Declare>
-
+   <Declare name="jsonxmlfmtconvert" class="com.hisun.handler.HiJsonXmlConvertHandler">
+   </Declare>
    <Process name="proc1" msgtype="DEFAULT">
       <Handler name="itfengine" />
       <Handler name="connector" />
+      <Handler name="jsonxmlfmtconvert" method="json2xml" />      
       <Handler name="itfengine" />
    </Process>
 
diff --git a/cap/etc/channel/monitor/SCAALERT_ITF.XML b/cap/etc/channel/monitor/SCAALERT_ITF.XML
index 6d16dc3..b01ca8a 100644
--- a/cap/etc/channel/monitor/SCAALERT_ITF.XML
+++ b/cap/etc/channel/monitor/SCAALERT_ITF.XML
@@ -21,6 +21,13 @@
                 <WriteElement name="startsAt"       ETF_name="startsAt"     necessary="no" />
                 <WriteElement name="endsAt"         ETF_name="endsAt"       necessary="no" />
                 <WriteElement name="generatorURL"   ETF_name="generatorURL" necessary="no" />
+
+	        	<WriteElement name="alerts" ETF_name="alerts" necessary="no">
+                     <WriteElement  name="annotations"  necessary="no">
+               	          <WriteElement name="summary" ETF_name="SUMMARY" necessary="no"/>
+                          <WriteElement name="description" ETF_name="DESCRIPTION" necessary="no"/> 
+                     </WriteElement>
+                </WriteElement>  
             </WriteElement>
         </Request>
         <Response necessary="no">