Merge branch 'master' into 'master'

配药退药追溯匹配优化

See merge request lighter/web-server!172

src/main/java/thyyxxk/webserver/dao/his/medicine/MzDrugTracCodgDao.java

@@ -48,12 +48,13 @@ public interface MzDrugTracCodgDao {
     void updateMzChargeDetailConfirmFlag(@Param("patNo") String patNo, @Param("times") Integer times,
                                         @Param("orderNo") Integer orderNo, @Param("groupNo") String groupNo);
 
-    @Select(" select ty.* from yp_mz_fytj as fy, mz_drug_trac_codg_ty as ty " +
-            " where fy.patient_id = #{patNo} and fy.times = #{times} " +
+    @Select(" select ty.* from mz_charge_detail as fy, mz_drug_trac_codg_ty as ty " +
+            " where fy.patient_id = #{patNo} and fy.times = #{times}" +
+            " and fy.group_no = #{groupNo} " +
             " and fy.patient_id = ty.patient_id " +
             " and fy.charge_item_code = ty.charge_item_code " +
             " and not exists (select 1 from mz_drug_trac_codg as tr where tr.drug_trac_codg = ty.drug_trac_codg) ")
-    List<MzDrugTracCodg> selectMzMatchCodgReturn(@Param("patNo") String patNo, @Param("times") Integer times);
+    List<MzDrugTracCodg> selectMzMatchCodgReturn(@Param("patNo") String patNo, @Param("times") Integer times, @Param("groupNo") String groupNo);
 
     @Delete("<script> " +
             " delete from mz_drug_trac_codg_ty where drug_trac_codg in " +

src/main/java/thyyxxk/webserver/service/medicine/YpCodgMatchService.java

@@ -646,7 +646,7 @@ public class YpCodgMatchService {
      * @Date 2025/9/8 0008 11:01
      */
     public ResultVo<List<MzDrugTracCodg>> selectMzMatchCodgReturn(YpCodgVo vo){
-        return ResultVoUtil.success(mzDrugTracCodgDao.selectMzMatchCodgReturn(vo.getPatNo(), vo.getTimes()));
+        return ResultVoUtil.success(mzDrugTracCodgDao.selectMzMatchCodgReturn(vo.getPatNo(), vo.getTimes(), vo.getGroupNo()));
     }
 
     /**