项目录入退药单

src/main/java/thyyxxk/webserver/controller/inpatient/XiangMuLuRuController.java

@@ -165,8 +165,9 @@ public class XiangMuLuRuController {
     @GetMapping("/drugRefundForm")
     public ResultVo<Map<String, List<DrugReturnForm>>> drugRefundForm(@RequestParam("groupNo") String groupNo,
                                                                       @RequestParam("patNo") String patNo,
-                                                                      @RequestParam("times") Integer times) {
-        return service.drugRefundForm(groupNo, patNo, times);
+                                                                      @RequestParam("times") Integer times,
+                                                                      @RequestParam("refundTime") String refundTime) {
+        return service.drugRefundForm(groupNo, patNo, times, refundTime);
     }
 
 }

src/main/java/thyyxxk/webserver/dao/his/inpatient/XiangMuLuRuDao.java

@@ -1244,7 +1244,8 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
     void xiuGaiZiFeiZhiYiBaoBiaoZhi(@Param(Constants.WRAPPER) Wrapper<?> wq);
 
 
-    @Select("select a.charge_code,\n" +
+    @Select("<script>" +
+            "select a.charge_code,\n" +
             "       b.name         as drug_name,\n" +
             "       b.specification,\n" +
             "       a.amount,\n" +
@@ -1258,15 +1259,18 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "     yp_zd_dict b\n" +
             "where a.inpatient_no = #{patNo}\n" +
             "  and a.admiss_times = #{times}" +
-            "  and a.dept_code = #{deptCode}" +
             "  and group_no = #{groupNo} " +
-            "  and a.status_flag = 1\n" +
-            "  and page_class = 'HT'\n" +
+            "  and a.status_flag = 1 " +
+            "  and page_class = 'HT' " +
+            "<if test=\"refundTime != null and refundTime != '' \">" +
+            " and CONVERT(varchar(100), occ_time, 23)  = #{refundTime} " +
+            "</if>" +
             "  and a.charge_code = b.code\n" +
-            "  and a.serial = b.serial")
-    List<DrugReturnForm> queryTheDrugReturnForm(@Param("deptCode") String deptCode,
-                                                @Param("groupNo") String groupNo,
+            "  and a.serial = b.serial " +
+            "</script>")
+    List<DrugReturnForm> queryTheDrugReturnForm(@Param("groupNo") String groupNo,
                                                 @Param("patNo") String patNo,
-                                                @Param("times") Integer times);
+                                                @Param("times") Integer times,
+                                                @Param("refundTime") String refundTime);
 
 }

src/main/java/thyyxxk/webserver/service/inpatient/XiangMuLuRuService.java

@@ -861,9 +861,8 @@ public class XiangMuLuRuService {
     }
 
 
-    public ResultVo<Map<String, List<DrugReturnForm>>> drugRefundForm(String groupNo, String patNo, Integer times) {
-        UserInfo info = redisLikeService.getUserInfoByToken();
-        Map<String, List<DrugReturnForm>> drugPageNoGy = dao.queryTheDrugReturnForm(info.getDeptCode(), groupNo, patNo, times).stream()
+    public ResultVo<Map<String, List<DrugReturnForm>>> drugRefundForm(String groupNo, String patNo, Integer times, String refundTime) {
+        Map<String, List<DrugReturnForm>> drugPageNoGy = dao.queryTheDrugReturnForm(groupNo, patNo, times, refundTime).stream()
                 .collect(Collectors.groupingBy(DrugReturnForm::getPageNoTy));
         if (drugPageNoGy.isEmpty()) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有护士退药单。");