还原

src/main/java/thyyxxk/webserver/dao/his/inpatient/casefrontsheet/CaseFrontSheetDao.java

@@ -39,7 +39,7 @@ public interface CaseFrontSheetDao extends BaseMapper<CaseFrontsheetMain> {
 
     @Select("select healthCardNo=rtrim(health_card_no),bah=rtrim(inpatient_no),name=rtrim(name),sex=rtrim(sex), " +
             "birthDate=birth_date,country=rtrim(country),birthPlace=rtrim(birth_place),nation=rtrim(nation_code), " +
-            "birthPlaceName=isnull((select rtrim(name) from zd_district_code with(nolock) where code=birth_place),birth_place), " +
+            "birthPlaceName=(select rtrim(name) from zd_district_code with(nolock) where code=birth_place), " +
             "socialNo=rtrim(social_no),occupation=rtrim(occupation_code),marriage=rtrim(marry_code), " +
             "livePlace=rtrim(home_street),phone=rtrim(home_tel),addrZipCode=rtrim(home_zipcode),hkZipCode=rtrim(account_zipcode), " +
             "unitName=rtrim(employer_name),unitPlace=rtrim(employer_street),unitPhone=rtrim(employer_tel), " +
@@ -98,7 +98,7 @@ public interface CaseFrontSheetDao extends BaseMapper<CaseFrontsheetMain> {
 
     @Select("select payMethod=rtrim(pay_method),ageDays=rtrim(age_days),newBornWeight=rtrim(new_born_weight)," +
             "newBornAdmissWeight=rtrim(new_born_admiss_weight),zyAdmissWay=rtrim(rytj),nativePlace=rtrim(jg)," +
-            "nativePlaceName=isnull((select rtrim(name) from zd_district_code with(nolock) where code=jg),jg)," +
+            "nativePlaceName=(select rtrim(name) from zd_district_code with(nolock) where code=jg)," +
             "hkPlace=rtrim(hkdz),hkPlaceName=rtrim(hkdz2),contactAddr=rtrim(lxdz),contactAddrName=rtrim(lxdz2)," +
             "hkZipCode=rtrim(hkyb) from batj_ba1 with(nolock) where bah=#{bah} and zycs=#{times}")
     CaseFrontsheetMain getBatjBa1(String bah, int times);