wu před 2 měsíci
rodič
revize
266b43bea7

+ 2 - 1
src/custom/beans/CommonHepler.java

@@ -70,8 +70,9 @@ public class CommonHepler {
 
     //获取医院最新年度手术预估手术量
     public static RowsMap getHospitalOPRowsMap(Controller controller) throws YosException {
-        return controller.dbConnect.runSqlQuery("SELECT t1.sa_customersid,sum(qty) qty,max(year) year from sa_surgeryforecast t1 " +
+        return controller.dbConnect.runSqlQuery("SELECT t1.sa_customersid,sum(qty) qty from sa_surgeryforecast t1 " +
                 "INNER JOIN sa_surgeryforecast_items t2 ON t2.sa_surgeryforecastid=t1.sa_surgeryforecastid and t1.siteid=t2.siteid " +
+                " WHERE year=year(current_date) "+
                 "GROUP BY t1.sa_customersid").toRowsMap("sa_customersid");
     }
 }

+ 0 - 1
src/custom/service/AutoCreateSurgeryForecast.java

@@ -13,7 +13,6 @@ public class AutoCreateSurgeryForecast extends ServiceController {
     @Override
     public void serviceRun() throws Exception {
         currentyear();
-        nextyear();
 
     }