Merge branch 'dev-1.1.4' of 172.16.32.165:hurugang/thmz_system into dev-1.1.4

src/main/java/cn/hnthyy/thmz/mapper/his/mz/ChargeFeeVoMapper.java

@@ -622,18 +622,18 @@ public interface ChargeFeeVoMapper {
                     " ABS(sum ( case when (paymode <![CDATA[<>]]> 'hospital_z' or paymode is null) and times  <![CDATA[<]]> 0 then req_fee + oth_fee + clinic_fee + isnull ( brochure_fee , 0 ) + isnull ( bl_fee , 0 ) + isnull ( ck_fee , 0 ) else 0 end )) hjth, " +
                     " count ( case when times  <![CDATA[>]]> 0 and (paymode <![CDATA[<>]]> 'hospital_z' or paymode is null) then 1 else null end ) -count ( case when  (paymode <![CDATA[<>]]> 'hospital_z' or paymode is null)  and times  <![CDATA[<]]> 0 then 1 else null end ) hjsshs," +
                     " sum ( case when paymode <![CDATA[<>]]> 'hospital_z' or paymode is null then req_fee + oth_fee + clinic_fee + isnull ( brochure_fee , 0 ) + isnull ( bl_fee , 0 ) + isnull ( ck_fee , 0 ) else 0 end ) hjss," +
-                    " count ( case when times  <![CDATA[>]]> 0 and paymode ='WX' then 1 else null end ) wxzzhs," +
-                    " sum ( case when times  <![CDATA[>]]> 0 and paymode ='WX'  then req_fee + oth_fee + clinic_fee + isnull ( brochure_fee , 0 ) + isnull ( bl_fee , 0 ) + isnull ( ck_fee , 0 ) else 0 end )  wxzzsk, " +
-                    " count ( case when op_id='99999' and  times  <![CDATA[<]]> 0 and paymode ='WX' then 1 else null end ) wxzzthhs," +
-                    " ABS( sum ( case when op_id='99999' and   times  <![CDATA[<]]> 0 and paymode ='WX'  then req_fee + oth_fee + clinic_fee + isnull ( brochure_fee , 0 ) + isnull ( bl_fee , 0 ) + isnull ( ck_fee , 0 ) else 0 end )) wxzzth, " +
-                    " count ( case when times  <![CDATA[>]]> 0 and paymode ='WX' then 1 else null end )  - count ( case when  op_id='99999' and times  <![CDATA[<]]> 0 and paymode ='WX' then 1 else null end ) wxzzsshs," +
-                    " sum ( case when op_id='99999' and paymode ='WX' then req_fee + oth_fee + clinic_fee + isnull ( brochure_fee , 0 ) + isnull ( bl_fee , 0 ) + isnull ( ck_fee , 0 ) else 0 end ) wxzzss, " +
-                    " count ( case when times  <![CDATA[>]]> 0 and paymode ='ZFB' then 1 else null end ) zfbzzhs," +
-                    " sum ( case when times  <![CDATA[>]]> 0 and paymode ='ZFB'  then req_fee + oth_fee + clinic_fee + isnull ( brochure_fee , 0 ) + isnull ( bl_fee , 0 ) + isnull ( ck_fee , 0 ) else 0 end )  zfbzzsk, " +
-                    " count ( case when op_id='99999' and    times  <![CDATA[<]]> 0 and paymode ='ZFB' then 1 else null end ) zfbzzthhs," +
-                    " ABS( sum ( case when  op_id='99999' and   times  <![CDATA[<]]> 0 and paymode ='ZFB'  then req_fee + oth_fee + clinic_fee + isnull ( brochure_fee , 0 ) + isnull ( bl_fee , 0 ) + isnull ( ck_fee , 0 ) else 0 end )) zfbzzth, " +
-                    " count ( case when times  <![CDATA[>]]> 0 and paymode ='ZFB' then 1 else null end )  - count ( case when op_id='99999' and times  <![CDATA[<]]> 0 and paymode ='ZFB' then 1 else null end ) zfbzzsshs," +
-                    " sum ( case when op_id='99999' and paymode ='ZFB' then req_fee + oth_fee + clinic_fee + isnull ( brochure_fee , 0 ) + isnull ( bl_fee , 0 ) + isnull ( ck_fee , 0 ) else 0 end ) zfbzzss, " +
+                    " count ( case when times  <![CDATA[>]]> 0 and paymode ='W' then 1 else null end ) wxzzhs," +
+                    " sum ( case when times  <![CDATA[>]]> 0 and paymode ='W'  then req_fee + oth_fee + clinic_fee + isnull ( brochure_fee , 0 ) + isnull ( bl_fee , 0 ) + isnull ( ck_fee , 0 ) else 0 end )  wxzzsk, " +
+                    " count ( case when op_id='99999' and  times  <![CDATA[<]]> 0 and paymode ='W' then 1 else null end ) wxzzthhs," +
+                    " ABS( sum ( case when op_id='99999' and   times  <![CDATA[<]]> 0 and paymode ='W'  then req_fee + oth_fee + clinic_fee + isnull ( brochure_fee , 0 ) + isnull ( bl_fee , 0 ) + isnull ( ck_fee , 0 ) else 0 end )) wxzzth, " +
+                    " count ( case when times  <![CDATA[>]]> 0 and paymode ='W' then 1 else null end )  - count ( case when  op_id='99999' and times  <![CDATA[<]]> 0 and paymode ='W' then 1 else null end ) wxzzsshs," +
+                    " sum ( case when op_id='99999' and paymode ='W' then req_fee + oth_fee + clinic_fee + isnull ( brochure_fee , 0 ) + isnull ( bl_fee , 0 ) + isnull ( ck_fee , 0 ) else 0 end ) wxzzss, " +
+                    " count ( case when times  <![CDATA[>]]> 0 and paymode ='M' then 1 else null end ) zfbzzhs," +
+                    " sum ( case when times  <![CDATA[>]]> 0 and paymode ='M'  then req_fee + oth_fee + clinic_fee + isnull ( brochure_fee , 0 ) + isnull ( bl_fee , 0 ) + isnull ( ck_fee , 0 ) else 0 end )  zfbzzsk, " +
+                    " count ( case when op_id='99999' and    times  <![CDATA[<]]> 0 and paymode ='M' then 1 else null end ) zfbzzthhs," +
+                    " ABS( sum ( case when  op_id='99999' and   times  <![CDATA[<]]> 0 and paymode ='M'  then req_fee + oth_fee + clinic_fee + isnull ( brochure_fee , 0 ) + isnull ( bl_fee , 0 ) + isnull ( ck_fee , 0 ) else 0 end )) zfbzzth, " +
+                    " count ( case when times  <![CDATA[>]]> 0 and paymode ='M' then 1 else null end )  - count ( case when op_id='99999' and times  <![CDATA[<]]> 0 and paymode ='M' then 1 else null end ) zfbzzsshs," +
+                    " sum ( case when op_id='99999' and paymode ='M' then req_fee + oth_fee + clinic_fee + isnull ( brochure_fee , 0 ) + isnull ( bl_fee , 0 ) + isnull ( ck_fee , 0 ) else 0 end ) zfbzzss, " +
                     " sum ( case when isnull ( paymode , '1' ) = 'Y' then req_fee + oth_fee + clinic_fee + isnull ( brochure_fee , 0 ) + isnull ( bl_fee , 0 ) + isnull ( ck_fee , 0 ) else 0 end ) ghjejz," +
                     " sum ( case when isnull ( paymode , '1' ) <![CDATA[<>]]> 'Y' then req_fee + oth_fee + clinic_fee + isnull ( brochure_fee , 0 ) + isnull ( bl_fee , 0 ) + isnull ( ck_fee , 0 ) else 0 end ) ghjebhjz," +
                     " sum ( clinic_fee ) zcsr," +