修复卫健委匹配问题

src/main/java/thyyxxk/webserver/dao/his/dictionary/HisWjwMatchDao.java

@@ -12,24 +12,27 @@ import java.util.List;
 public interface HisWjwMatchDao {
 
     @Select("<script>" +
-            "select code,name,wjw_code,py_code from ${table} " +
+            "select code,name,wjw_code,isnull(py_code,'') as pyCode from ${table} " +
             "<if test=\"table == 'zd_unit_code' \">" +
             "where code like '1%' and isnull(del_flag,0)!=1 " +
             "</if>" +
             "</script>")
     List<HisWjwMatchEntity> selectHisData(@Param("table") String table);
 
-    @Select("select code,name,py_code from ${table}")
+    @Select("select code,name,isnull(py_code,'') as pyCode from ${table}")
     List<HisWjwMatchEntity> selectWjwData(@Param("table") String table);
 
-    @Select("select rtrim(code) as code,rtrim(name) as name,rtrim(py_code) as py_code, " +
+    @Select("select rtrim(code) as code,rtrim(name) as name, " +
+            "isnull(rtrim(py_code),'') as pyCode, " +
             "rtrim(yb_code) as wjwCode,rtrim(yb_name) as wjwName from ${table}")
     List<HisWjwMatchEntity> selectYbData(@Param("table") String table);
 
-    @Select("select rtrim(code) as code, rtrim(name) as name from ${table} where yb_code is null")
+    @Select("select rtrim(code) as code, rtrim(name) as name, " +
+            "isnull(rtrim(py_code),'') as pyCode from ${table} where yb_code is null")
     List<HisWjwMatchEntity> selectNationTempData(@Param("table") String table);
 
-    @Select("select ${codeColumn} as code, ${nameColumn} as name, py_code from ${table} where " +
+    @Select("select ${codeColumn} as code, ${nameColumn} as name, " +
+            "isnull(py_code,'') as pyCode from ${table} where " +
             "${codeColumn} like #{key} ")
     List<HisWjwMatchEntity> selectMedInsData(@Param("table") String table,
                                              @Param("codeColumn") String codeColumn,
@@ -37,10 +40,10 @@ public interface HisWjwMatchDao {
                                              @Param("key") String key);
 
     @Select("select rtrim(code) as code,name,charge_code as wjwCode,charge_name as wjwName, " +
-            "rtrim(py_code) as pyCode from zd_icd9_cm3 where del_flag=0")
+            "isnull(rtrim(py_code),'') as pyCode from zd_icd9_cm3 where del_flag=0")
     List<HisWjwMatchEntity> selectSurgeries();
 
-    @Select("select code,name,py_code from zd_charge_item where del_flag=0")
+    @Select("select code,name,isnull(py_code,'') as pyCode from zd_charge_item where del_flag=0")
     List<HisWjwMatchEntity> selectChargeCodes();
 
     @Update("<script>" +