出库修改页面添加几个搜索条件，以及删除的功能。

src/main/java/thyyxxk/webserver/controller/datamodify/InOrOutOfWarehouseController.java

@@ -60,4 +60,12 @@ public class InOrOutOfWarehouseController {
     public ResultVo<String> xiuGaiChuKuXinXi(@RequestBody YpOutDetl param) {
         return service.xiuGaiChuKuXinXi(param);
     }
+
+    @GetMapping("/shanChuChuKuXinXi")
+    public ResultVo<String> shanChuChuKuXinXi(@RequestParam("drawNo") String drawNo,
+                                              @RequestParam("chargeCode") String chargeCode,
+                                              @RequestParam("outSeri") Integer outSeri,
+                                              @RequestParam("inDrawNo") String inDrawNo) {
+        return service.shanChuChuKuXinXi(drawNo, chargeCode, outSeri, inDrawNo);
+    }
 }

src/main/java/thyyxxk/webserver/dao/his/datamodify/InOrOutOfWarehouseDao.java

@@ -1,10 +1,7 @@
 package thyyxxk.webserver.dao.his.datamodify;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.*;
 import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
 import thyyxxk.webserver.entity.datamodify.InOrOutOfWarehousePojo;
 import thyyxxk.webserver.entity.datamodify.YpInDetl;
@@ -95,6 +92,12 @@ public interface InOrOutOfWarehouseDao {
             "<if test=\"param.drawNo!=null and param.drawNo!=''\">" +
             "and draw_no=#{param.drawNo}" +
             "</if>" +
+            "<if test=\"param.inDrawNo!=null and param.inDrawNo!=''\">" +
+            "and in_draw_no=#{param.inDrawNo}" +
+            "</if>" +
+            "<if test=\"param.chargeCode!=null and param.chargeCode!=''\">" +
+            "and charge_code=#{param.chargeCode}" +
+            "</if>" +
             "</script>")
     List<YpOutDetl> queryChuKuXinXi(IPage<InOrOutOfWarehousePojo> page, @Param("param") InOrOutOfWarehousePojo param);
 
@@ -129,5 +132,24 @@ public interface InOrOutOfWarehouseDao {
             "where out_seri=#{outSeri} and draw_no=#{oldDrawNo} and charge_code = #{chargeCode}")
     void xiuGaiChuKu(YpOutDetl param);
 
+    /**
+     * 删除出库的一条记录
+     *
+     * @param drawNo     出库号
+     * @param chargeCode 药品编码
+     * @param outSeri    序号
+     * @param inDrawNo   入库单号
+     */
+    @Delete("<script>" +
+            "delete from yp_out_detl where draw_no=#{drawNo} and charge_code=#{chargeCode} and out_seri=#{outSeri} " +
+            "<if test=\"inDrawNo!=null and inDrawNo!=''\">" +
+            "and in_draw_no=#{inDrawNo}" +
+            "</if> " +
+            "</script>")
+    void shanChuChuKuXinXin(@Param("drawNo") String drawNo,
+                            @Param("chargeCode") String chargeCode,
+                            @Param("outSeri") Integer outSeri,
+                            @Param("inDrawNo") String inDrawNo);
+
 
 }

src/main/java/thyyxxk/webserver/dao/his/querydata/CovidVaccinateAppointmentDao.java

@@ -81,7 +81,7 @@ public interface CovidVaccinateAppointmentDao {
             "insert into t_covid_vaccinate_factory (code, vaccinate_id, specification, price, name,enable_flag) " +
             "values" +
             "<foreach collection='param' item='item' index='index' separator=','>" +
-            " (#{item.code},#{item.vaccinateId},#{item.specification},#{item.price},#{item.name},#{item.enableFlag})" +
+            " (#{item.code},#{item.vaccinateId},#{item.specification},cast(#{item.price,jdbcType=DECIMAL} as decimal(14,5)),#{item.name},#{item.enableFlag})" +
             "</foreach>" +
             "</script>")
     void xinZengChangJia(List<CovidVaccinateFactory> param);

src/main/java/thyyxxk/webserver/dao/his/yibao/TransferInOfExpensesDao.java

@@ -49,7 +49,8 @@ public interface TransferInOfExpensesDao {
      * @param serialNo  机制号
      * @return 返回多个
      */
-    @Select("select unit_price charge_fee,quantity charge_amount,Convert(decimal(18,2),unit_price)unit_price,tc_name,quantity,patient_id,times,receipt_no,order_no," +
+    @Select("select unit_price charge_fee,quantity charge_amount,Convert(decimal(18,2),unit_price)unit_price," +
+            "tc_name,quantity,patient_id,times,receipt_no,order_no," +
             "item_no,charge_item_code charge_code_mx,charge_item_code charge_code,doctor_code," +
             "detail_flag detail_sn," +
             "receipt_no,real_no,charge_date,self_flag,charge_bill_code,serial,serial_no " +
@@ -116,7 +117,7 @@ public interface TransferInOfExpensesDao {
             "</script>")
     void insertInfoZyDetailCharge(@Param("info") ZyActpatient info, @Param("list") List<MzChargeDetail> zyFees);
 
-    @Select("select max(detail_sn) from zy_detail_charge where inpatient_no=#{inpatientNo} and admiss_times=#{admissTimes}")
+    @Select("select isnull(max(detail_sn),0) from zy_detail_charge where inpatient_no=#{inpatientNo} and admiss_times=#{admissTimes}")
     Integer getMaxDetailSn(@Param("inpatientNo") String inpatientNo,
                            @Param("admissTimes") Integer admissTimes);
 

src/main/java/thyyxxk/webserver/entity/datamodify/InOrOutOfWarehousePojo.java

@@ -14,7 +14,10 @@ import lombok.Data;
 public class InOrOutOfWarehousePojo {
     private String startTime;
     private String endTime;
+    private String chargeCode;
+    
     private String inDocuNo;
+    private String inDrawNo;
     private String drawNo;
     private long currentPage;
     private long pageSize;

src/main/java/thyyxxk/webserver/service/datamodify/InOrOutOfWarehouseService.java

@@ -97,6 +97,7 @@ public class InOrOutOfWarehouseService {
      * @return 返回分页的数据
      */
     public ResultVo<Map<String, Object>> queryChuKuXinXi(InOrOutOfWarehousePojo param) {
+        log.info("查询出库信息：{}", param);
         IPage<InOrOutOfWarehousePojo> page = new Page<>(param.getCurrentPage(), param.getPageSize());
         List<YpOutDetl> list = dao.queryChuKuXinXi(page, param);
         if (list.size() <= 0) {
@@ -131,4 +132,20 @@ public class InOrOutOfWarehouseService {
         dao.xiuGaiChuKu(param);
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "修改成功");
     }
+
+    /**
+     * 删除出库的一条记录
+     *
+     * @param drawNo     出库号
+     * @param chargeCode 药品编码
+     * @param outSeri    序号
+     * @param inDrawNo   入库单号
+     * @return 返回提醒
+     */
+    public ResultVo<String> shanChuChuKuXinXi(String drawNo, String chargeCode, Integer outSeri, String inDrawNo) {
+        log.info("删除出库信息：操作人：{}，出库号：{}，药品编码：{}，序号：{}，入库单号：{}", TokenUtil.getTokenUserId(), drawNo, chargeCode, outSeri, inDrawNo);
+        dao.shanChuChuKuXinXin(drawNo, chargeCode, outSeri, inDrawNo);
+        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "删除成功。");
+
+    }
 }

src/main/java/thyyxxk/webserver/service/yibao/TransferInOfExpensesService.java

@@ -120,10 +120,7 @@ public class TransferInOfExpensesService {
         List<MzChargeDetail> list = param.getList();
         //查询流水号
         Integer maxDetailSn = dao.getMaxDetailSn(param.getInpatientNo(), param.getAdmissTimes());
-        if (maxDetailSn == null) {
-            maxDetailSn = 0;
-        }
-        // 流水号取出这个患者的最流水值
+        // 流水号取出这个患者流水值的最大值 在加 1
         for (MzChargeDetail mzChargeDetail : list) {
             mzChargeDetail.setDetailSn(maxDetailSn += 1);
         }