wu 3 месяцев назад
Родитель
Сommit
aff3576a92

+ 2 - 1
src/custom/restcontroller/common/task/task2.java

@@ -112,11 +112,12 @@ public class task2 extends Controller {
                 "hospitaldepname");
         followquerySQL.addJoinTable(JOINTYPE.left, "sa_doctor", "t4", "t4.sa_doctorid=t1.sa_doctorid and t4.siteid=t1.siteid",
                 "doctorname");
-        followquerySQL.addJoinTable(JOINTYPE.left, "sys_task", "t5", "t5.sys_taskid=t1.sys_taskid and t5.siteid=t1.siteid","contenttext");
+        followquerySQL.addJoinTable(JOINTYPE.left, "sys_task", "t5", "t5.sys_taskid=t1.sys_taskid and t5.siteid=t1.siteid");
         followquerySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t6", "t6.sa_agentsid=t1.sa_agentsid and t6.siteid=t1.siteid");
         followquerySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t61", "t61.sys_enterpriseid=t6.sys_enterpriseid and t61.siteid=t6.siteid");
         followquerySQL.addQueryFields("hospitalname", "t21.enterprisename");
         followquerySQL.addQueryFields("tasktitle", "t5.title");
+        followquerySQL.addQueryFields("taskcontenttext", "t5.contenttext");
         followquerySQL.addQueryFields("agentsname", "t61.enterprisename");
         followquerySQL.setSiteid(siteid);
         followquerySQL.addQueryFields("followdate", "DATE_FORMAT(t1.createdate,'%Y-%m-%d')");

+ 2 - 0
src/custom/restcontroller/system/datafollowup/datafollowup.java

@@ -67,6 +67,7 @@ public class datafollowup extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t61", "t61.sys_enterpriseid=t6.sys_enterpriseid and t61.siteid=t6.siteid");
         querySQL.addQueryFields("hospitalname", "t21.enterprisename");
         querySQL.addQueryFields("tasktitle", "t5.title");
+        querySQL.addQueryFields("taskcontenttext", "t5.contenttext");
         querySQL.addQueryFields("agentsname", "t61.enterprisename");
         querySQL.setSiteid(siteid);
         querySQL.setWhere(where);
@@ -134,6 +135,7 @@ public class datafollowup extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t61", "t61.sys_enterpriseid=t6.sys_enterpriseid and t61.siteid=t6.siteid");
         querySQL.addQueryFields("hospitalname", "t21.enterprisename");
         querySQL.addQueryFields("tasktitle", "t5.title");
+        querySQL.addQueryFields("taskcontenttext", "t5.contenttext");
         querySQL.addQueryFields("agentsname", "t61.enterprisename");
         querySQL.setSiteid(siteid);
         querySQL.setWhere("sys_datafollowupid", sys_datafollowupid);