Browse Source

优化格式

lighter 2 years ago
parent
commit
6aa788c5e5

+ 11 - 38
src/main/java/thyyxxk/webserver/dao/his/casefrontsheet/CaseFrontSheetDao.java

@@ -33,32 +33,14 @@ public interface CaseFrontSheetDao extends BaseMapper<CaseFrontsheetMain> {
             "charindex('$',inpatient_no)=0 ORDER BY cast(bed_no AS int)")
     List<SheetOverview> getOutPatients(GetOutSheet param);
 
-    @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)," +
+    @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=(select rtrim(name) from zd_district_code with(nolock) where code=birth_place), " +
-            "nation=rtrim(nation_code), " +
-            "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), " +
-            "unitZipCode=rtrim(employer_zipcode), " +
-            "contactName=rtrim(relation_name), " +
-            "contactRelation=rtrim(relation_code), " +
-            "contactPhone=(rtrim(relation_tel))  " +
-            "from a_patient_mi with(nolock) " +
-            "where inpatient_no=#{bah}")
+            "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), " +
+            "unitZipCode=rtrim(employer_zipcode),contactName=rtrim(relation_name),contactRelation=rtrim(relation_code), " +
+            "contactPhone=(rtrim(relation_tel)) from a_patient_mi with(nolock) where inpatient_no=#{bah}")
     CaseFrontsheetMain getAPatientMi(@Param("bah") String bah);
 
     @Select("select sum(charge12) surgeryFee,sum(charge1) westMedicineFee,sum(charge2) chineseHerbalMedicineFee, " +
@@ -117,20 +99,11 @@ public interface CaseFrontSheetDao extends BaseMapper<CaseFrontsheetMain> {
                                        @Param("bah") String bah, @Param("times") int times);
 
 
-    @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)," +
+    @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=(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}")
+            "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(@Param("bah") String bah, @Param("times") int times);
 
     @Select("select " +