优化追溯码上传

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

@@ -47,7 +47,7 @@ public interface YpSelinfoSoldDao extends BaseMapper<YpSelinfoSold> {
             " where so.sel_retn_time &gt;= #{dto.startTime} " +
             " and so.sel_retn_time &lt;= #{dto.endTime} " +
             " and so.is_ty = '0' " +
-            " and so.group_no = #{groupNo}  " +
+            " and so.group_no = #{dto.groupNo}  " +
             " <if test=\"dto.patNo != null and dto.patNo != ''\"> " +
             " and so.pat_no = #{dto.patNo} " +
             " </if> " +
@@ -59,15 +59,15 @@ public interface YpSelinfoSoldDao extends BaseMapper<YpSelinfoSold> {
             " </if> " +
             " order by so.sel_retn_time, so.pat_no " +
             "</script>")
-    List<YpSelinfoSold> selectYpSelinfoSoldResult(@Param("dto") YpCodgUpload dto, @Param("groupNo") String groupNo);
+    List<YpSelinfoSold> selectYpSelinfoSoldResult(@Param("dto") YpCodgUpload dto);
 
     @Select("<script> " +
             " select bo.* from yp_selinfo_sold as bo " +
             " where bo.sel_retn_time &gt;= #{dto.startTime} " +
             " and bo.sel_retn_time &lt;= #{dto.endTime} " +
             " and bo.is_ty = '1' " +
-            " and bo.group_no = #{groupNo}  " +
-            " <if test=\"dto.patNo != null and dto.patNo != ''\"> " +
+            " and bo.group_no = #{dto.groupNo}  " +
+            " <if test=\"dto.d != null and dto.patNo != ''\"> " +
             " and bo.pat_no = #{dto.patNo} " +
             " </if> " +
             " <if test=\"dto.chargeCode != null and dto.chargeCode != ''\"> " +
@@ -78,6 +78,6 @@ public interface YpSelinfoSoldDao extends BaseMapper<YpSelinfoSold> {
             " </if> " +
             " order by bo.sel_retn_time, bo.pat_no " +
             "</script>")
-    List<YpSelinfoSold> selectYpSelinfoSoldTkResult(@Param("dto") YpCodgUpload dto, @Param("groupNo") String groupNo);
+    List<YpSelinfoSold> selectYpSelinfoSoldTkResult(@Param("dto") YpCodgUpload dto);
 
 }

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

@@ -56,9 +56,9 @@ public class YpSelinfoSoldService {
     public ResultVo<List<YpSelinfoSold>> selectYpSelinfoResult(YpCodgUpload dto) {
         List<YpSelinfoSold> purcinfoList;
         if("3".equals(dto.getType())){
-            purcinfoList = dao.selectYpSelinfoSoldResult(dto, dto.getGroupNo());
+            purcinfoList = dao.selectYpSelinfoSoldResult(dto);
         } else {
-            purcinfoList = dao.selectYpSelinfoSoldTkResult(dto, dto.getGroupNo());
+            purcinfoList = dao.selectYpSelinfoSoldTkResult(dto);
         }
         return ResultVoUtil.success(purcinfoList);
     }