病案首页出院患者统计添加入院诊断

src/main/java/thyyxxk/webserver/dao/his/casefrontsheet/CaseFrontSheetAnalyzeDao.java

@@ -22,7 +22,7 @@ public interface CaseFrontSheetAnalyzeDao {
             "rtrim(a.name) as name,gender=(case when a.sex='1' then '男' else '女' end), " +
             "age=datediff(year,b.birth_date,getdate()),a.admiss_date,a.dis_date, " +
             "inHospDays=datediff(day, a.admiss_date, a.dis_date),a.total_charge, " +
-            "rtrim(a.zk_ward) as disDept, " +
+            "rtrim(a.zk_ward) as disDept,rtrim(a.clinic_diag_str) as admDiag, " +
             "disDiag=(select dis_diag_comment from ba_first_page1 t where t.inpatient_no=a.inpatient_no " +
             "and t.admiss_times=a.admiss_times and t.dis_diag_no=1), " +
             "blfx=isnull(c.blfx,''),rtrim(a.small_dept) as admissDept,rtrim(a.zk_ward) as zkWard, " +

src/main/java/thyyxxk/webserver/entity/casefrontsheet/DismissCount.java

@@ -21,6 +21,7 @@ public class DismissCount {
     private Integer inHospDays;
     private String totalCharge;
     private String disDept;
+    private String admDiag;
     private String disDiag;
     private String blfx;
     private String admissDept;