手术判断问题

src/main/java/thyyxxk/webserver/dao/his/dashboard/DashboardDao.java

@@ -19,7 +19,7 @@ public interface DashboardDao {
             "convertAdmissDate=admiss_date, " +
             "physician=(select rtrim(t.name) from a_employee_mi t where t.code=a.refer_physician), " +
             "a.med_type, " +
-            "surgery=(select top 1 rtrim(op_name) from op_record t where t.inpatient_no=a.inpatient_no " +
+            "surgery=(select top 1 rtrim(op_scale) + N'级' from op_record t where t.inpatient_no=a.inpatient_no " +
             "and t.admiss_times=a.admiss_times and t.status!='d' and datediff(day ,getdate(), t.op_datetime)=0), " +
             "nursingLevel=(select top 1 rtrim(order_name) from yz_act_order t where " +
             "t.order_code in ('05298','05299','05300','05301') and t.group_no='00' and t.status_flag in ('3','4')  " +

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/ShouShuShenQingDao.java

@@ -62,7 +62,7 @@ public interface ShouShuShenQingDao extends BaseMapper<OpRecord> {
                                                @Param("name") String name);
 
 
-    @Select("select count(1) from op_record where inpatient_no = #{patNo} and admiss_times = #{times} and status <> 'd' ")
+    @Select("select count(1) from op_record where inpatient_no = #{patNo} and admiss_times = #{times} and status <> 'd' and urgent_clinic_flag = '0' ")
     int currentPatientOpCount(String patNo, Integer times);
 
     @Select("select count(1) from emr_patient_data where pat_no = #{patNo} and times = #{times} and del_flag = 0  and emr_category_code = 'shuqiantaolun' ")

src/main/java/thyyxxk/webserver/service/dashboard/DashboardService.java

@@ -11,7 +11,6 @@ import thyyxxk.webserver.utils.DateUtil;
 import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.StringUtil;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;