jiangs/blood
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

血袋回收功能修改

Browse Source
This commit is contained in:
jiangs 2026-09-11 18:04:43 +08:00
parent 7a93c10ad0
commit 216e6b0280
5 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
blood_bus/src/main/java/com/czblood/bus/controller/BloodCommonController.java
View File

@ -148,6 +148,7 @@ public class BloodCommonController extends BaseController {
@GetMapping("/queryBloodInfoByBloodNo")
public Result queryBloodInfoByBloodNo(String bloodNo){
List<XkBloodInfo> xkBloodInfoList = xkBloodInfoMapper.queryListByBloodNo(bloodNo);
if(xkBloodInfoList.isEmpty()) return new Result("1","未查询到该血液信息！");
return new Result("0","获取数据成功！",xkBloodInfoList);
}

5
blood_bus/src/main/resources/mapper/XkRecycleBagMainMapper.xml
View File

@ -3,13 +3,14 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.czblood.bus.mapper.XkRecycleBagMainMapper">
<insert id="insert">
insert into xk_recycle_bag_main (bill_no, send_person, send_date,receive_person,receive_date,sum,
insert into xk_recycle_bag_main (
<if test="Exp1 != null">Exp1,</if>
<if test="Exp2 != null">Exp2,</if>
bill_no, send_person, send_date,receive_person,receive_date,sum
)values(
#{bill_no},#{send_person},#{send_date},#{receive_person},#{receive_date},#{sum},
<if test="Exp1 != null">#{Exp1},</if>
<if test="Exp2 != null">#{Exp2},</if>
#{bill_no},#{send_person},#{send_date},#{receive_person},#{receive_date},#{sum}
)
</insert>

5
blood_bus_nurse/src/main/java/com/czblood/busNurse/mapper/RecycleBagMapper.java
View File

@ -2,13 +2,14 @@ package com.czblood.busNurse.mapper;
import com.czblood.busNurse.pojo.DTO.RecycleBagDTO;
import com.czblood.busNurse.pojo.VO.RecycleBagSearchVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
public interface RecycleBagMapper {
List<Map<String,Object>> getBloodInfo(String bloodNo, String productNo);
List<Map<String,Object>> getBloodInfo(@Param("bloodNo") String bloodNo,@Param("productNo") String productNo);
List<RecycleBagDTO> queryBatchData(RecycleBagSearchVO recycleBagSearchVO);
List<Map<String,Object>> queryBillNoBloodInfo(String billNo);
int queryRecycleBagCount(String billNo);
}
}

1
blood_bus_nurse/src/main/java/com/czblood/busNurse/service/impl/RecycleBagServiceImpl.java
View File

@ -49,6 +49,7 @@ public class RecycleBagServiceImpl implements RecycleBagService {
String recycleSign = BloodBankUtil.isBank(xkBloodInfo.getRecycle_sign());
if(recycleSign.equals("Y")) return new Result("-1","该血袋已经登记回收信息!");
List<Map<String, Object>> bloodInfoList = recycleBagMapper.getBloodInfo(bloodNo, productNo);
if(bloodInfoList.isEmpty()) return new Result("-1","未查询到该血液信息！");
return new Result("0","操作成功",bloodInfoList.get(0));
}

24
blood_bus_nurse/src/main/resources/mapper/RecycleBagMapper.xml
View File

@ -3,27 +3,19 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.czblood.busNurse.mapper.RecycleBagMapper">
<select id="getBloodInfo" resultType="java.util.Map">
Select xk_out_main.patient_name , xk_out_main.dept_id , xk_blood_info.blood_breed , xk_blood_info.blood_type , xk_blood_info.capacity , xk_blood_info.unit , xk_out_main.bill_no
From xk_out_main , xk_out_detail , xk_blood_info
Select xk_out_main.patient_name , xk_out_main.dept_id , xk_blood_info.blood_breed , xk_blood_info.blood_type ,
xk_blood_info.capacity , xk_blood_info.unit , xk_out_main.bill_no,xk_out_main.beinhos_id,xk_patient_info.patient_sex
From xk_out_main left join xk_patient_info on (xk_out_main.beinhos_id = xk_patient_info.beinhos_id), xk_out_detail , xk_blood_info
Where ( xk_out_main.bill_no =xk_out_detail.bill_no ) and
( xk_out_detail.blood_no =xk_blood_info.blood_no ) and
( xk_blood_info.blood_no = #{bloodNo} ) AND (xk_blood_info.product_no = #{productNo})
</select>
<select id="queryBatchData" resultType="com.czblood.busNurse.pojo.DTO.RecycleBagDTO">
SELECT
xk_out_main.bill_no,
xk_out_main.occur_date,
xk_out_main.patient_name,
xk_out_main.beinhos_id,
xk_out_main.dept_id
FROM xk_out_main ,xk_out_detail,xk_blood_info
WHERE ( isnull(all_recycle_sign,'N') = 'N' )
and ( xk_out_main.bill_no = xk_out_detail.bill_no )
and ( xk_out_detail.blood_no = xk_blood_info.blood_no )
and (xk_out_detail.product_no = xk_blood_info.product_no)
<![CDATA[ and (xk_blood_info.blood_sort <> 'Z') ]]>
SELECT xk_out_main.bill_no, xk_out_main.occur_date, xk_out_main.patient_name, xk_out_main.beinhos_id, xk_out_main.dept_id
FROM xk_out_main WHERE ( isnull(all_recycle_sign,'N') = 'N' )
and ( xk_out_main.occur_date between #{stime} and #{etime} )
<if test="dept != null">and xk_out_main.dept_id = #{dept}</if>
and isnull(xk_out_main.check_sign,'N') = 'Y'
<if test="dept != null and dept != ''">and xk_out_main.dept_id = #{dept}</if>
</select>
<select id="queryBillNoBloodInfo" resultType="java.util.Map">
SELECT xk_blood_info.blood_no,
@ -42,7 +34,7 @@
( xk_blood_info.product_no = xk_out_detail.product_no ) and
( xk_out_detail.bill_no = xk_out_main.bill_no ) and
( ( xk_out_main.bill_no = #{billNo} ) )
and isnull(xk_blood_info.recycle_sign,'') = 'Y'
and isnull(xk_blood_info.recycle_sign,'N') = 'N'
</select>
<select id="queryRecycleBagCount" resultType="java.lang.Integer">