'yzorder'

src/main/java/thyyxxk/webserver/dao/his/medicaladvice/medicamanage/MedicalManagementDao.java

@@ -398,7 +398,7 @@ public interface MedicalManagementDao {
             "  and a.order_code = b.order_code" +
             "  and a.group_no = '00'" +
             "  and a.doctor_flag = '1'" +
-            " union all" +
+            " union" +
             " SELECT act_order_no=a.act_order_no," +
             "       inpatient_no=a.inpatient_no," +
             "       dept_code =a.dept_code," +
@@ -448,7 +448,7 @@ public interface MedicalManagementDao {
             "<if test=\" endTime !=null \">"+
             "  and a.start_time &lt;= #{endTime}" +
             "</if>"+
-            "  and a.group_no != '00'" +
+//            "  and a.group_no != '00'" +
             "  and a.doctor_flag = '1'" +
             " order by page_no, order_time_b, parent_no, act_order_no"+
             "</script>")