|
@@ -159,20 +159,17 @@ public interface YpMzFytjMapper {
|
|
|
" real_no=yp_mz_fytj.real_no," +
|
|
|
" win_no = yp_mz_fytj.win_no, " +
|
|
|
" yp_mz_fytj.manu_no " +
|
|
|
- " FROM yp_mz_fytj WITH(NOLOCK) , " +
|
|
|
- " yp_zd_dict c WITH(NOLOCK), " +
|
|
|
- " yp_zd_manufactory d WITH(NOLOCK) " +
|
|
|
- " WHERE yp_mz_fytj.patient_id = #{patientId} AND " +
|
|
|
+ " FROM yp_mz_fytj WITH(NOLOCK) " +
|
|
|
+ " JOIN yp_zd_dict c WITH(NOLOCK) ON yp_mz_fytj.charge_item_code = c.code AND yp_mz_fytj.serial = c.serial " +
|
|
|
+ " LEFT JOIN yp_zd_manufactory d WITH(NOLOCK) ON c.manu_code = d.code " +
|
|
|
+ " WHERE yp_mz_fytj.patient_id = #{patientId} AND " +
|
|
|
" yp_mz_fytj.times = #{times} AND " +
|
|
|
" yp_mz_fytj.receipt_no = #{receiptNo} AND " +
|
|
|
" yp_mz_fytj.order_no = #{orderNo} AND " +
|
|
|
- " yp_mz_fytj.group_no_out = #{groupNoOut} AND " +
|
|
|
- " yp_mz_fytj.charge_item_code = c.code and " +
|
|
|
- " yp_mz_fytj.serial = c.serial and " +
|
|
|
- " yp_mz_fytj.confirm_flag = '1' and " +
|
|
|
- " yp_mz_fytj.serial_no > 0 and " +
|
|
|
- " c.manu_code *= d.code " +
|
|
|
- "ORDER BY yp_mz_fytj.item_no ASC ",
|
|
|
+ " yp_mz_fytj.group_no_out = #{groupNoOut} AND " +
|
|
|
+ " yp_mz_fytj.confirm_flag = '1' and " +
|
|
|
+ " yp_mz_fytj.serial_no > 0 " +
|
|
|
+ "ORDER BY yp_mz_fytj.item_no ASC " +
|
|
|
"</script>"})
|
|
|
List<Map<String,Object>> selectYpMx(ChargeFeeParamsVo chargeFeeParamsVo);
|
|
|
|
|
@@ -222,7 +219,7 @@ public interface YpMzFytjMapper {
|
|
|
" yp_mz_fytj.receipt_no, " +
|
|
|
" drugname=c.name+'('+isnull(d.abbr_name,isnull(d.name,''))+')', " +
|
|
|
" specification=c.specification, " +
|
|
|
- " quantity= case when yp_mz_fytj.cy_fy is not null and yp_mz_fytj.cy_fy >0 then yp_mz_fytj.quantity * cy_fy else yp_mz_fytj.quantity end, " +
|
|
|
+ " quantity= case when yp_mz_fytj.cy_fy is not null and yp_mz_fytj.cy_fy > 0 then yp_mz_fytj.quantity * cy_fy else yp_mz_fytj.quantity end, " +
|
|
|
" yp_mz_fytj.unit_price, " +
|
|
|
" yp_mz_fytj.item_no, " +
|
|
|
" yp_mz_fytj.drug_flag, " +
|
|
@@ -241,27 +238,31 @@ public interface YpMzFytjMapper {
|
|
|
" yp_mz_fytj.drugname, " +
|
|
|
" yp_mz_fytj.doctor_name, " +
|
|
|
" yp_mz_fytj.doctor_id, " +
|
|
|
- " dec_amount=case when yp_mz_fytj.cy_fy is not null and yp_mz_fytj.cy_fy >0 then yp_mz_fytj.quantity * cy_fy else yp_mz_fytj.quantity end , " +
|
|
|
+ " dec_amount=case when yp_mz_fytj.cy_fy is not null and yp_mz_fytj.cy_fy > 0 then yp_mz_fytj.quantity * cy_fy else yp_mz_fytj.quantity end, " +
|
|
|
" warn_dept=yp_mz_fytj.warn_dept, " +
|
|
|
" yp_mz_fytj.country_flag, " +
|
|
|
" yp_mz_fytj.confirm_flag, " +
|
|
|
" yp_mz_fytj.self_flag, " +
|
|
|
" yp_mz_fytj.response_type, " +
|
|
|
- " yp_mz_fytj.warn_dept ," +
|
|
|
- " real_no=yp_mz_fytj.real_no," +
|
|
|
- " win_no = yp_mz_fytj.win_no, " +
|
|
|
- " yp_mz_fytj.manu_no " +
|
|
|
- " FROM (select * from yp_mz_fytj WITH(NOLOCK) where patient_id = #{patientId} and times = #{times} and receipt_no = #{receiptNo} and quantity <![CDATA[>]]> 0 ) yp_mz_fytj , " +
|
|
|
- " yp_zd_dict c WITH(NOLOCK), " +
|
|
|
- " yp_zd_manufactory d WITH(NOLOCK) " +
|
|
|
- " WHERE yp_mz_fytj.order_no = #{orderNo} AND " +
|
|
|
- " yp_mz_fytj.group_no_out = #{groupNoOut} AND " +
|
|
|
- " yp_mz_fytj.charge_item_code = c.code and " +
|
|
|
- " yp_mz_fytj.serial = c.serial and " +
|
|
|
- " yp_mz_fytj.confirm_flag = '2' and " +
|
|
|
- " yp_mz_fytj.serial_no <![CDATA[<]]> 0 and " +
|
|
|
- " c.manu_code *= d.code " +
|
|
|
- "ORDER BY yp_mz_fytj.item_no ASC ",
|
|
|
+ " yp_mz_fytj.warn_dept, " +
|
|
|
+ " real_no=yp_mz_fytj.real_no, " +
|
|
|
+ " win_no = yp_mz_fytj.win_no, " +
|
|
|
+ " yp_mz_fytj.manu_no " +
|
|
|
+ " FROM (SELECT * FROM yp_mz_fytj WITH(NOLOCK) " +
|
|
|
+ " WHERE patient_id = #{patientId} " +
|
|
|
+ " AND times = #{times} " +
|
|
|
+ " AND receipt_no = #{receiptNo} " +
|
|
|
+ " AND quantity <![CDATA[>]]> 0) yp_mz_fytj " +
|
|
|
+ " JOIN yp_zd_dict c WITH(NOLOCK) " +
|
|
|
+ " ON yp_mz_fytj.charge_item_code = c.code " +
|
|
|
+ " AND yp_mz_fytj.serial = c.serial " +
|
|
|
+ " LEFT JOIN yp_zd_manufactory d WITH(NOLOCK) " +
|
|
|
+ " ON c.manu_code = d.code " +
|
|
|
+ " WHERE yp_mz_fytj.order_no = #{orderNo} " +
|
|
|
+ " AND yp_mz_fytj.group_no_out = #{groupNoOut} " +
|
|
|
+ " AND yp_mz_fytj.confirm_flag = '2' " +
|
|
|
+ " AND yp_mz_fytj.serial_no <![CDATA[<]]> 0 " +
|
|
|
+ "ORDER BY yp_mz_fytj.item_no ASC " +
|
|
|
"</script>"})
|
|
|
List<Map<String,Object>> selectRefundMedicineDetail(ChargeFeeParamsVo chargeFeeParamsVo);
|
|
|
/**
|