门诊显示项目名称

src/main/java/thyyxxk/webserver/dao/his/reports/KeShiShouRuDao.java

@@ -232,11 +232,24 @@ public interface KeShiShouRuDao {
      * @return 返回信息
      */
     @Select("<script>" +
-            "select top ${pageSize} * from (select ROW_NUMBER() over (ORDER BY confirm_time ) as RowNumber, rtrim(patient_id) patient," +
-            "times,rtrim(name) patient_name, " +
-            "rtrim(charge_item_code) charge_code_mx,confirm_time as charge_date,confirm_id op_id_code,rtrim(exec_dept) exec_unit,rtrim(warn_dept) ward_code, " +
-            "cast ((quantity*drug_win) as decimal(14,2)) charge_amount, " +
-            "cast ((quantity*drug_win*unit_price) as decimal(14,2)) charge_fee,source = '门诊' " +
+            "select top ${pageSize} * from (select               ROW_NUMBER() over ( " +
+            "    ORDER BY " +
+            "        confirm_time )                  as                                            RowNumber, " +
+            "                           rtrim(patient_id)                                          patient, " +
+            "                           times, " +
+            "                           rtrim(name)                                                patient_name, " +
+            "                           rtrim(charge_item_code)                                    charge_code_mx, " +
+            "          chargeCodeName = dbo.get_charge_name(charge_item_code, group_no), " +
+            "                           confirm_time as                                            charge_date, " +
+            "                           confirm_id                                                 op_id_code, " +
+            "          opName         = (select top 1 rtrim(name) from a_employee_mi where confirm_id = confirm_id), " +
+            "                           rtrim(exec_dept)                                           exec_unit, " +
+            "          execUnitName   = (select top 1 rtrim(name) from zd_unit_code where code = exec_dept), " +
+            "                           rtrim(warn_dept)                                           ward_code, " +
+            "          ward_code_name = (select top 1 rtrim(name) from zd_unit_code where code = warn_dept), " +
+            "                           cast((quantity * drug_win) as decimal(14, 2))              charge_amount, " +
+            "                           cast((quantity * drug_win * unit_price) as decimal(14, 2)) charge_fee, " +
+            "          source         = N'门诊' " +
             "from mz_charge_detail where  bill_item_code NOT IN ('TC','020') and " +
             "confirm_time &gt;= #{startTime,jdbcType = TIMESTAMP} and confirm_time &lt;= #{endTime,jdbcType = TIMESTAMP}" +
             "<if test=\"list != null and list.size > 0 \">" +

src/main/java/thyyxxk/webserver/service/reports/KeShiShouRuServer.java

@@ -197,7 +197,6 @@ public class KeShiShouRuServer {
                     break;
             }
         }
-//        pingJieZiDuanMingChen(qp, huanZheBiao);
         return ResultVoUtil.success(qp);
     }