diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml
index 0351339..5099879 100644
--- a/Dao/MyBatis/Maps/CRoom.xml
+++ b/Dao/MyBatis/Maps/CRoom.xml
@@ -1522,24 +1522,30 @@
           select a.*
           from (
             select
-            l.lectno,l.iscomplete,l.completetime,l.completeno,l.sdate,l.edate,l.cdt,l.cno,pp.udt,l.uno,l.uip
-            ,cm.cgno,cm.studytime,cm.cshape,cm.cname,cm.studyplace
-            ,t.tyear
-            ,cg.cgname,cg.pcgno
-            ,pcg.cgname as pcgname            
-            ,u.userno,u.userid,u.username,u.uduty,u.slevel
-            ,CAST(AES_DECRYPT(UNHEX(u.userpno), <include refid="sql.digest"></include>) AS char) as userpno
-            ,CAST(AES_DECRYPT(UNHEX(u.mobile), <include refid="sql.digest"></include>) AS char) as mobile
-            ,CAST(AES_DECRYPT(UNHEX(u.email), <include refid="sql.digest"></include>) AS char) as email
-            ,pi.tbankuser as rbankuser,pi.rbank,pi.pino,pi.rbankamt
-            ,CAST(AES_DECRYPT(UNHEX(pi.rbankaccnum), <include refid="sql.digest"></include>) AS char) as rbankaccnum            
-            ,p.payamt
-            ,pp.pplno,pp.typeman,pp.typeedu,pp.typegrade,pp.typejob
-            ,pp.asname,pp.post,pp.address1,pp.address2,pp.brno,pp.eino,pp.btype,pp.bkind,pp.ceoname,pp.mname,pp.association
-            ,CAST(AES_DECRYPT(UNHEX(pp.mphone), <include refid="sql.digest"></include>) AS char) as mphone
-            ,CAST(AES_DECRYPT(UNHEX(pp.taxemail), <include refid="sql.digest"></include>) AS char) as taxemail
-            ,row_number() over(order by l.lectno desc) rno
-            ,count(l.lectno) over() pagetotalcount
+            l.lectno,l.iscomplete,l.completetime,l.completeno
+              ,case when cm.cshape = 1 then l.sdate
+                else p.payoktime end sdate
+              ,case when cm.cshape = 1 then l.edate
+                else cmi.estart end edate
+              ,l.cdt,l.cno,pp.udt,l.uno,l.uip
+              ,cm.cgno,cm.studytime,cm.cshape,cm.cname,cm.studyplace
+              ,t.tyear
+              ,cg.cgname,cg.pcgno
+              ,pcg.cgname as pcgname            
+              ,u.userno,u.userid,u.username,u.uduty,u.slevel
+              ,CAST(AES_DECRYPT(UNHEX(u.userpno), <include refid="sql.digest"></include>) AS char) as userpno
+              ,CAST(AES_DECRYPT(UNHEX(u.mobile), <include refid="sql.digest"></include>) AS char) as mobile
+              ,CAST(AES_DECRYPT(UNHEX(u.email), <include refid="sql.digest"></include>) AS char) as email
+              ,pi.tbankuser as rbankuser,pi.rbank,pi.pino,pi.rbankamt
+              ,CAST(AES_DECRYPT(UNHEX(pi.rbankaccnum), <include refid="sql.digest"></include>) AS char) as rbankaccnum            
+              ,p.payamt
+              ,pp.pplno,pp.typeman,pp.typeedu,pp.typegrade,pp.typejob
+              ,pp.asname,pp.post,pp.address1,pp.address2,pp.brno,pp.eino,pp.btype,pp.bkind,pp.ceoname,pp.mname,pp.association
+              ,CAST(AES_DECRYPT(UNHEX(pp.mphone), <include refid="sql.digest"></include>) AS char) as mphone
+              ,CAST(AES_DECRYPT(UNHEX(pp.taxemail), <include refid="sql.digest"></include>) AS char) as taxemail
+              ,case when p.ispg = 1 then p.payno else 0 end
+              ,row_number() over(order by l.lectno desc) rno
+              ,count(l.lectno) over() pagetotalcount
             from lect l
             left outer join cm cm on cm.cmno = l.cmno
             left outer join term t on t.tmno=cm.tmno
@@ -1549,6 +1555,7 @@
             left outer join pay p on p.payno = l.payno
             left outer join payitem pi on pi.payno = p.payno
             left outer join pplog pp on pp.pplno = p.pplno
+            left outer join cminningscd cmi on cmi.cmisno = pp.cmisno
             where l.iscomplete = 1 
             <isNotNull property="lectno" prepend="and">l.lectno = #lectno#</isNotNull>
             <isNotNull property="scompletetime" prepend="and">l.completetime &gt;= #scompletetime#</isNotNull>
diff --git a/Model/CM.cs b/Model/CM.cs
index 302233c..19785c5 100644
--- a/Model/CM.cs
+++ b/Model/CM.cs
@@ -3828,5 +3828,13 @@ namespace NP.Model
         /// pplog.pplno
         /// </summary>
         public Int64 pplno { get; set; }
+        public Int64 payno { get; set; }
+        public String paynostr
+        {
+            get
+            {
+                return payno > 0 ? "pr" + payno : null;
+            }
+        }
     }
 }
diff --git a/Model/Documents.cs b/Model/Documents.cs
index ceefe20..bb4d50c 100644
--- a/Model/Documents.cs
+++ b/Model/Documents.cs
@@ -213,6 +213,8 @@ namespace NP.Model
         public int? pagenum { get; set; }
         public int pageviewcount { get; set; }
         public int pagerowcount { get; set; } 
+        public String userid { get; set; }
+        public String paynostr { get; set; }
     }
     public class textvalue
     {