诊断取 zd_icd_code_new 中的

src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/UpIdCollectionDao.java

@@ -380,7 +380,24 @@ public interface UpIdCollectionDao {
     @Select("select top(1) * from t_yb_set_modify_time")
     TYbSetModifyTime keXiuGaiShiJian();
 
-    @Select("<script>" + "select rtrim(inpatient_no) inpatient_no,admiss_times,dis_diag,dis_diag_comment from ${tableName} where inpatient_no in " + "<foreach collection='patNos' item='item' index='index' open='(' close=')' separator=','>" + "#{item}" + "</foreach>" + " and dis_diag_no = 1" + "</script>")
+    @Select("<script>" +
+            "select rtrim(inpatient_no) inpatient_no,admiss_times," +
+            "case\n" +
+            "                    when yb_code is null then rtrim(dis_diag)\n" +
+            "                    else rtrim(yb_code)\n" +
+            "                    end             dis_diag," +
+            "case\n" +
+            "                    when yb_name is null then rtrim(dis_diag_comment)\n" +
+            "                    else rtrim(yb_name)\n" +
+            "                    end             dis_diag_comment " +
+            " from ${tableName} left join " +
+            "     zd_icd_code_new on (dis_diag = code) " +
+            "where inpatient_no in " +
+            "<foreach collection='patNos' item='item' index='index' open='(' close=')' separator=','>" +
+            "#{item}" +
+            "</foreach>" +
+            " and dis_diag_no = 1" +
+            "</script>")
     List<ZyDisDiagYb> zhuZhenDuan(@Param("patNos") Set<String> patNos, @Param("tableName") String tableName);