lihong 7 bulan lalu
induk
melakukan
3e24d8df59

+ 10 - 12
src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzyReqrecMapper.java

@@ -314,18 +314,16 @@ public interface MzyReqrecMapper {
     @Select({"<script>" +
             "   SELECT dept_name=mz_unit_code.name, " +
             "         mz_unit_code.d_code,  " +
-            " mzy_reqrec.unit_code," +
-            " mzy_reqrec.charge_type," +
+            "         mzy_reqrec.unit_code," +
+            "         mzy_reqrec.charge_type," +
             "         charge_type_name=mzy_zd_charge_type.name,  " +
             "         mzy_zd_charge_type.code," +
             "         patient_count = COUNT ( ( CASE  WHEN mzy_reqrec.times<![CDATA[<]]>0 THEN NULL ELSE mzy_reqrec.patient_id END ) )-COUNT ( ( CASE  WHEN mzy_reqrec.times<![CDATA[>]]>0 THEN NULL ELSE mzy_reqrec.patient_id END ) )," +
             "         req_fee=sum(mzy_reqrec.req_fee + mzy_reqrec.clinic_fee + mzy_reqrec.oth_fee + isnull(bl_fee,0) + isnull(ck_fee,0)+ isnull(zlk_fee,0) + isnull(blb_fee,0))" +
-            "    FROM zd_unit_code mz_unit_code WITH(NOLOCK),   " +
-            "         ${firstTableName} mzy_reqrec WITH(NOLOCK),   " +
-            "         mzy_zd_charge_type  WITH(NOLOCK)" +
-            "   WHERE ( mz_unit_code.code = mzy_reqrec.unit_code ) and  " +
-            "         ( mzy_reqrec.charge_type *= mzy_zd_charge_type.code ) and " +
-            "         (case when 1=#{caseType}  then mzy_reqrec.op_day else mzy_reqrec.closing_date end) <![CDATA[>=]]>#{beginDate,jdbcType=TIMESTAMP} and " +
+            "    FROM ${firstTableName} mzy_reqrec WITH(NOLOCK)" +
+            "     JOIN zd_unit_code mz_unit_code WITH(NOLOCK) ON mz_unit_code.code = mzy_reqrec.unit_code" +
+            "    LEFT JOIN mzy_zd_charge_type WITH(NOLOCK) ON mzy_reqrec.charge_type = mzy_zd_charge_type.code" +
+            "   WHERE (case when 1=#{caseType}  then mzy_reqrec.op_day else mzy_reqrec.closing_date end) <![CDATA[>=]]>#{beginDate,jdbcType=TIMESTAMP} and " +
             "         (case when 1=#{caseType}  then mzy_reqrec.op_day else mzy_reqrec.closing_date end) <![CDATA[<=]]>#{endDate,jdbcType=TIMESTAMP}  " +
             "<when test='jzSqDept!=null'>" +
             " and mzy_reqrec.unit_code =#{jzSqDept}" +
@@ -333,12 +331,12 @@ public interface MzyReqrecMapper {
             "<when test='jzSqDoctor!=null'>" +
             " and mzy_reqrec.doctor_code =#{jzSqDoctor}" +
             "</when>" +
-            "group by mz_unit_code.name," +
-            " mz_unit_code.d_code," +
+            " group by mz_unit_code.name," +
+            "         mz_unit_code.d_code," +
             "         mzy_zd_charge_type.name," +
             "         mzy_zd_charge_type.code," +
-            " mzy_reqrec.unit_code," +
-            " mzy_reqrec.charge_type  "
+            "         mzy_reqrec.unit_code," +
+            "         mzy_reqrec.charge_type  "
             , "</script>"})
     List<Map<String, Object>> selectMzhbCount(ThmzmxsrParamsVo thmzmxsrParamsVo);