From 30ba8485f812da7e15f8420f2eab9317e3e644d1 Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Wed, 29 Jul 2026 16:31:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E6=9C=AC=E6=8E=A5=E6=94=B6=EF=BC=8C?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8D=95=E6=89=AB=E6=8F=8F=E7=99=BB=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/mapper/XkSampleInfoMapper.java | 1 + .../com/czblood/bus/pojo/XkSampleInfo.java | 38 +++---- .../resources/mapper/XkSampleInfoMapper.xml | 104 +++++++++++------- .../AcceptSampleInfoController.java | 40 +++++++ .../SearchTransfuseBillController.java | 3 +- .../mapper/AcceptSampleInfoMapper.java | 10 ++ .../mapper/SearchTransfuseBillMapper.java | 4 +- .../pojo/VO/AcceptSampleInfoQueryVO.java | 16 +++ .../service/AcceptSampleInfoService.java | 13 +++ .../service/SearchTransfuseBillService.java | 3 +- .../impl/AcceptSampleInfoServiceImpl.java | 70 ++++++++++++ .../impl/SearchTransfuseBillServiceImpl.java | 18 ++- .../mapper/AcceptSampleInfoMapper.xml | 37 +++++++ .../mapper/SearchTransfuseBillMapper.xml | 2 +- .../busNurse/pojo/VO/SampleInfoVO.java | 2 +- sql/updatedb_blood.sql | 5 + 16 files changed, 303 insertions(+), 63 deletions(-) create mode 100644 blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/controller/AcceptSampleInfoController.java create mode 100644 blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/mapper/AcceptSampleInfoMapper.java create mode 100644 blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/pojo/VO/AcceptSampleInfoQueryVO.java create mode 100644 blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/AcceptSampleInfoService.java create mode 100644 blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/AcceptSampleInfoServiceImpl.java create mode 100644 blood_bus_bloodbank/src/main/resources/mapper/AcceptSampleInfoMapper.xml diff --git a/blood_bus/src/main/java/com/czblood/bus/mapper/XkSampleInfoMapper.java b/blood_bus/src/main/java/com/czblood/bus/mapper/XkSampleInfoMapper.java index 810afd0..91fbc4d 100644 --- a/blood_bus/src/main/java/com/czblood/bus/mapper/XkSampleInfoMapper.java +++ b/blood_bus/src/main/java/com/czblood/bus/mapper/XkSampleInfoMapper.java @@ -5,4 +5,5 @@ import com.czblood.bus.pojo.XkSampleInfo; public interface XkSampleInfoMapper { XkSampleInfo queryOne(String sampleNo); void insert(XkSampleInfo xkSampleInfo); + void update(XkSampleInfo xkSampleInfo); } diff --git a/blood_bus/src/main/java/com/czblood/bus/pojo/XkSampleInfo.java b/blood_bus/src/main/java/com/czblood/bus/pojo/XkSampleInfo.java index 515baaf..b88d909 100644 --- a/blood_bus/src/main/java/com/czblood/bus/pojo/XkSampleInfo.java +++ b/blood_bus/src/main/java/com/czblood/bus/pojo/XkSampleInfo.java @@ -14,38 +14,38 @@ import java.util.Date; @Api(tags = "样本信息") public class XkSampleInfo { @ApiModelProperty("样本号") - private String Sample_No; + private String sample_No; @ApiModelProperty("标本用途，A输血，B血型鉴定，S治疗") - private String Purpose; + private String purpose; @ApiModelProperty("申请科室") - private String Dept; + private String dept; @ApiModelProperty("关联申请单号") - private String Relate_ApplyNo; + private String relate_ApplyNo; @ApiModelProperty("血型") - private String Blood_Type; + private String blood_Type; @ApiModelProperty("RH血型") - private String Rh_Blood_Type; + private String rh_Blood_Type; @ApiModelProperty("姓名") - private String Sample_Name; - private String Sex; - private String Age; - private Date Birthday; + private String sample_Name; + private String sex; + private String age; + private Date birthday; @ApiModelProperty("采集护士") - private String Pick_Nurse; + private String pick_Nurse; @ApiModelProperty("采集时间") - private Date Pick_Date; + private Date pick_Date; @ApiModelProperty("送标本护士") - private String Send_Nurse; + private String send_Nurse; @ApiModelProperty("送标本时间") - private Date Send_Date; + private Date send_Date; @ApiModelProperty("接收人") - private String TakeOver_Man; + private String takeOver_Man; @ApiModelProperty("接收时间") - private Date TakeOver_Date; + private Date takeOver_Date; @ApiModelProperty("过期标志") - private String Overdue_Flag; - private String Exp1; - private String Exp2; + private String overdue_Flag; + private String exp1; + private String exp2; @ApiModelProperty("样本状态，1打印条码，2已采样，3已送检，4已签收，5复核血型") private String sample_status; @ApiModelProperty("作废人") diff --git a/blood_bus/src/main/resources/mapper/XkSampleInfoMapper.xml b/blood_bus/src/main/resources/mapper/XkSampleInfoMapper.xml index b1a2eda..6d8dac3 100644 --- a/blood_bus/src/main/resources/mapper/XkSampleInfoMapper.xml +++ b/blood_bus/src/main/resources/mapper/XkSampleInfoMapper.xml @@ -4,24 +4,24 @@ insert into xk_sample_info( - Purpose, - Dept, - Relate_ApplyNo, - Blood_Type, - Rh_Blood_Type, - Sample_Name, - Sex, - Age, - Birthday, - Pick_Nurse, - Pick_Date, - Send_Nurse, - Send_Date, - TakeOver_Man, - TakeOver_Date, - Overdue_Flag, - Exp1, - Exp2, + purpose, + dept, + Relate_ApplyNo, + Blood_Type, + Rh_Blood_Type, + Sample_Name, + Sex, + Age, + Birthday, + Pick_Nurse, + Pick_Date, + Send_Nurse, + Send_Date, + TakeOver_Man, + TakeOver_Date, + Overdue_Flag, + Exp1, + Exp2, sample_status, discard_person, discard_date, @@ -31,24 +31,24 @@ createtime, Sample_No )values( - #{Purpose}, - #{Dept}, - #{Relate_ApplyNo}, - #{Blood_Type}, - #{Rh_Blood_Type}, - #{Sample_Name}, - #{Sex}, - #{Age}, - #{Birthday}, - #{Pick_Nurse}, - #{Pick_Date}, - #{Send_Nurse}, - #{Send_Date}, - #{TakeOver_Man}, - #{TakeOver_Date}, - #{Overdue_Flag}, - #{Exp1}, - #{Exp2}, + #{purpose}, + #{dept}, + #{relate_ApplyNo}, + #{blood_Type}, + #{rh_Blood_Type}, + #{sample_Name}, + #{sex}, + #{age}, + #{birthday}, + #{pick_Nurse}, + #{pick_Date}, + #{send_Nurse}, + #{send_Date}, + #{takeOver_Man}, + #{takeOver_Date}, + #{overdue_Flag}, + #{exp1}, + #{exp2}, #{sample_status}, #{discard_person}, #{discard_date}, @@ -56,8 +56,38 @@ #{senddate}, #{sendperson}, #{createtime}, - #{Sample_No}) + #{sample_No}) + + update xk_sample_info set + purpose = #{purpose}, + dept = #{dept}, + relate_ApplyNo = #{relate_ApplyNo}, + blood_Type = #{blood_Type}, + rh_Blood_Type = #{rh_Blood_Type}, + sample_Name = #{sample_Name}, + sex = #{sex}, + age = #{age}, + birthday = #{birthday}, + pick_Nurse = #{pick_Nurse}, + pick_Date = #{pick_Date}, + send_Nurse = #{send_Nurse}, + send_Date = #{send_Date}, + takeOver_Man = #{takeOver_Man}, + takeOver_Date = #{takeOver_Date}, + overdue_Flag = #{overdue_Flag}, + exp1 = #{exp1}, + exp2 = #{exp2}, + sample_status = #{sample_status}, + discard_person = #{discard_person}, + discard_date = #{discard_date}, + discard_reason = #{discard_reason}, + senddate = #{senddate}, + sendperson = #{sendperson}, + createtime = #{createtime}, + Sample_No = #{sample_no} + where Sample_No = #{sample_no} + diff --git a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/controller/AcceptSampleInfoController.java b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/controller/AcceptSampleInfoController.java new file mode 100644 index 0000000..d70a880 --- /dev/null +++ b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/controller/AcceptSampleInfoController.java @@ -0,0 +1,40 @@ +package com.czblood.busBloodbank.controller; + +import com.czblood.bus.pojo.XkSampleInfo; +import com.czblood.busBloodbank.pojo.VO.AcceptSampleInfoQueryVO; +import com.czblood.busBloodbank.service.AcceptSampleInfoService; +import com.czblood.common.core.controller.BaseController; +import com.czblood.common.core.domain.Result; +import com.czblood.common.core.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +@Api(tags = "标本接收") +@RestController +@RequestMapping("/bus/bloodbank/acceptSampleInfo") +public class AcceptSampleInfoController extends BaseController { + + @Resource + private AcceptSampleInfoService acceptSampleInfoService; + + @ApiOperation("标本列表查询") + @GetMapping("/queryList") + public TableDataInfo queryList(AcceptSampleInfoQueryVO acceptSampleInfoQueryVO){ + List> list = acceptSampleInfoService.queryList(acceptSampleInfoQueryVO); + return getDataTable(list); + } + + @ApiOperation("标本接收") + @PostMapping("/acceptSampleInfo") + public Result acceptSampleInfo(XkSampleInfo xKSampleInfo){ + return acceptSampleInfoService.acceptSampleInfo(xKSampleInfo); + } +} diff --git a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/controller/SearchTransfuseBillController.java b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/controller/SearchTransfuseBillController.java index 0fe62e5..56535e9 100644 --- a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/controller/SearchTransfuseBillController.java +++ b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/controller/SearchTransfuseBillController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; +import java.util.Map; @Api(tags = "申请单扫描登记") @RestController @@ -29,7 +30,7 @@ public class SearchTransfuseBillController extends BaseController { @ApiOperation("查询登记列表") @GetMapping("/queryList") public TableDataInfo queryList(XkSearchTransfuseBillVO xkSearchTransfuseBillVO) { - List xkSearchTransfuseBillList = searchTransfuseBillService.queryList(xkSearchTransfuseBillVO); + List> xkSearchTransfuseBillList = searchTransfuseBillService.queryList(xkSearchTransfuseBillVO); return getDataTable(xkSearchTransfuseBillList); } diff --git a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/mapper/AcceptSampleInfoMapper.java b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/mapper/AcceptSampleInfoMapper.java new file mode 100644 index 0000000..b34ea96 --- /dev/null +++ b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/mapper/AcceptSampleInfoMapper.java @@ -0,0 +1,10 @@ +package com.czblood.busBloodbank.mapper; + +import com.czblood.busBloodbank.pojo.VO.AcceptSampleInfoQueryVO; + +import java.util.List; +import java.util.Map; + +public interface AcceptSampleInfoMapper { + List> queryList(AcceptSampleInfoQueryVO acceptSampleInfoQueryVO); +} diff --git a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/mapper/SearchTransfuseBillMapper.java b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/mapper/SearchTransfuseBillMapper.java index 95453eb..f5c5e95 100644 --- a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/mapper/SearchTransfuseBillMapper.java +++ b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/mapper/SearchTransfuseBillMapper.java @@ -1,11 +1,11 @@ package com.czblood.busBloodbank.mapper; -import com.czblood.bus.pojo.XkSearchTransfuseBill; import com.czblood.busBloodbank.pojo.VO.XkSearchTransfuseBillVO; import java.util.List; +import java.util.Map; public interface SearchTransfuseBillMapper { - List queryList(XkSearchTransfuseBillVO xkSearchTransfuseBillVO); + List> queryList(XkSearchTransfuseBillVO xkSearchTransfuseBillVO); Integer getMaxSid(); } diff --git a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/pojo/VO/AcceptSampleInfoQueryVO.java b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/pojo/VO/AcceptSampleInfoQueryVO.java new file mode 100644 index 0000000..5dce844 --- /dev/null +++ b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/pojo/VO/AcceptSampleInfoQueryVO.java @@ -0,0 +1,16 @@ +package com.czblood.busBloodbank.pojo.VO; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class AcceptSampleInfoQueryVO { + private String stime; + private String etime; + private String dept; + private String sampleNo; + private String status; +} diff --git a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/AcceptSampleInfoService.java b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/AcceptSampleInfoService.java new file mode 100644 index 0000000..1999f82 --- /dev/null +++ b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/AcceptSampleInfoService.java @@ -0,0 +1,13 @@ +package com.czblood.busBloodbank.service; + +import com.czblood.bus.pojo.XkSampleInfo; +import com.czblood.busBloodbank.pojo.VO.AcceptSampleInfoQueryVO; +import com.czblood.common.core.domain.Result; + +import java.util.List; +import java.util.Map; + +public interface AcceptSampleInfoService { + List> queryList(AcceptSampleInfoQueryVO acceptSampleInfoQueryVO); + Result acceptSampleInfo(XkSampleInfo xKSampleInfo); +} diff --git a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/SearchTransfuseBillService.java b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/SearchTransfuseBillService.java index 80f092d..bdf5cae 100644 --- a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/SearchTransfuseBillService.java +++ b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/SearchTransfuseBillService.java @@ -5,9 +5,10 @@ import com.czblood.busBloodbank.pojo.VO.XkSearchTransfuseBillVO; import com.czblood.common.core.domain.Result; import java.util.List; +import java.util.Map; public interface SearchTransfuseBillService { - List queryList(XkSearchTransfuseBillVO xkSearchTransfuseBillVO); + List> queryList(XkSearchTransfuseBillVO xkSearchTransfuseBillVO); Result saveBillNo(XkSearchTransfuseBill xkSearchTransfuseBill); diff --git a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/AcceptSampleInfoServiceImpl.java b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/AcceptSampleInfoServiceImpl.java new file mode 100644 index 0000000..c66526c --- /dev/null +++ b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/AcceptSampleInfoServiceImpl.java @@ -0,0 +1,70 @@ +package com.czblood.busBloodbank.service.impl; + +import com.czblood.bus.mapper.XkSampleInfoMapper; +import com.czblood.bus.mapper.XkTransfuseApplyMapper; +import com.czblood.bus.pojo.XkSampleInfo; +import com.czblood.bus.pojo.XkTransfuseApply; +import com.czblood.bus.utils.BloodBankUtil; +import com.czblood.busBloodbank.mapper.AcceptSampleInfoMapper; +import com.czblood.busBloodbank.pojo.VO.AcceptSampleInfoQueryVO; +import com.czblood.busBloodbank.service.AcceptSampleInfoService; +import com.czblood.common.core.domain.Result; +import com.czblood.common.utils.spring.SpringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; +import java.util.Map; + +@Service +public class AcceptSampleInfoServiceImpl implements AcceptSampleInfoService { + + @Resource + AcceptSampleInfoMapper acceptSampleInfoMapper; + @Resource + XkSampleInfoMapper xkSampleInfoMapper; + @Resource + BloodBankUtil bloodBankUtil; + @Resource + XkTransfuseApplyMapper xkTransfuseApplyMapper; + + @Override + public List> queryList(AcceptSampleInfoQueryVO acceptSampleInfoQueryVO) { + return acceptSampleInfoMapper.queryList(acceptSampleInfoQueryVO); + } + + /** + * 接收样本信息 + * @param xKSampleInfo + * @return + */ + @Override + public Result acceptSampleInfo(XkSampleInfo xKSampleInfo) { + String sampleNo = xKSampleInfo.getSample_No(); + XkSampleInfo xkSampleInfo1 = xkSampleInfoMapper.queryOne(sampleNo); + if(xkSampleInfo1 == null) return new Result("-1","没有找到对应的样本信息！"); + XkSampleInfo xkSampleInfoTemp = new XkSampleInfo(); + xkSampleInfoTemp.setSample_No(xkSampleInfo1.getSample_No()); + xkSampleInfoTemp.setTakeOver_Man(xkSampleInfo1.getTakeOver_Man()); + xkSampleInfoTemp.setTakeOver_Date(xkSampleInfo1.getTakeOver_Date()); + xkSampleInfoTemp.setSample_status("5"); + xkSampleInfoTemp.setSendperson(xkSampleInfo1.getSendperson()); + + XkTransfuseApply xkTransfuseApply = new XkTransfuseApply(); + xkTransfuseApply.setBill_no(xkSampleInfo1.getRelate_ApplyNo()); + xkTransfuseApply.setGather_date(xkSampleInfo1.getPick_Date()); + xkTransfuseApply.setReceive_date(bloodBankUtil.getCurrentTimeDate()); + SpringUtils.getBean(AcceptSampleInfoServiceImpl.class).updateData(xkSampleInfoTemp, xkTransfuseApply); + return new Result("0","接收样本信息成功！"); + } + + @Transactional(rollbackFor = Exception.class) + public void updateData(XkSampleInfo xkSampleInfo, XkTransfuseApply xkTransfuseApply) { + xkSampleInfoMapper.update(xkSampleInfo); + xkTransfuseApplyMapper.update(xkTransfuseApply); + } + +} diff --git a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/SearchTransfuseBillServiceImpl.java b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/SearchTransfuseBillServiceImpl.java index 89b0d56..a7cf4dc 100644 --- a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/SearchTransfuseBillServiceImpl.java +++ b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/SearchTransfuseBillServiceImpl.java @@ -1,17 +1,23 @@ package com.czblood.busBloodbank.service.impl; import com.czblood.bus.mapper.XkSearchTransfuseBillMapper; +import com.czblood.bus.mapper.XkTransfuseApplyMapper; import com.czblood.bus.pojo.XkSearchTransfuseBill; +import com.czblood.bus.pojo.XkTransfuseApply; +import com.czblood.bus.utils.BloodBankUtil; import com.czblood.busBloodbank.mapper.SearchTransfuseBillMapper; import com.czblood.busBloodbank.pojo.VO.XkSearchTransfuseBillVO; import com.czblood.busBloodbank.service.SearchTransfuseBillService; import com.czblood.common.core.domain.Result; import com.czblood.common.utils.spring.SpringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Date; import java.util.List; +import java.util.Map; @Service public class SearchTransfuseBillServiceImpl implements SearchTransfuseBillService { @@ -20,9 +26,13 @@ public class SearchTransfuseBillServiceImpl implements SearchTransfuseBillServic private SearchTransfuseBillMapper searchTransfuseBillMapper; @Resource XkSearchTransfuseBillMapper xkSearchTransfuseBillMapper; + @Resource + XkTransfuseApplyMapper xkTransfuseApplyMapper; + @Autowired + private BloodBankUtil bloodBankUtil; @Override - public List queryList(XkSearchTransfuseBillVO xkSearchTransfuseBillVO) { + public List> queryList(XkSearchTransfuseBillVO xkSearchTransfuseBillVO) { return searchTransfuseBillMapper.queryList(xkSearchTransfuseBillVO); } @@ -35,6 +45,12 @@ public class SearchTransfuseBillServiceImpl implements SearchTransfuseBillServic public Result saveBillNo(XkSearchTransfuseBill xkSearchTransfuseBill) { XkSearchTransfuseBill xkSearchTransfuseBill1 = xkSearchTransfuseBillMapper.queryOne(xkSearchTransfuseBill.getBill_no()); if(xkSearchTransfuseBill1 != null) return new Result("-1","申请单已扫描登记！"); + XkTransfuseApply xkTransfuseApply = xkTransfuseApplyMapper.queryOne(xkSearchTransfuseBill.getBill_no()); + if(xkTransfuseApply == null) return new Result("-1","申请单不存在！"); + Date applyDate = xkTransfuseApply.getApply_date(); + Date inputDate = xkSearchTransfuseBill.getInput_date(); + if(inputDate.compareTo(bloodBankUtil.getCurrentTimeDate()) > 0) return new Result("-1","登记时间不能大于当前时间！"); + if(inputDate.compareTo(applyDate) < 0) return new Result("-1","登记时间不能小于申请时间！"); SpringUtils.getBean(SearchTransfuseBillServiceImpl.class).saveData(xkSearchTransfuseBill); return new Result("0","登记成功！"); } diff --git a/blood_bus_bloodbank/src/main/resources/mapper/AcceptSampleInfoMapper.xml b/blood_bus_bloodbank/src/main/resources/mapper/AcceptSampleInfoMapper.xml new file mode 100644 index 0000000..2b82ce8 --- /dev/null +++ b/blood_bus_bloodbank/src/main/resources/mapper/AcceptSampleInfoMapper.xml @@ -0,0 +1,37 @@ + + + + + + \ No newline at end of file diff --git a/blood_bus_bloodbank/src/main/resources/mapper/SearchTransfuseBillMapper.xml b/blood_bus_bloodbank/src/main/resources/mapper/SearchTransfuseBillMapper.xml index 6576532..d6987e6 100644 --- a/blood_bus_bloodbank/src/main/resources/mapper/SearchTransfuseBillMapper.xml +++ b/blood_bus_bloodbank/src/main/resources/mapper/SearchTransfuseBillMapper.xml @@ -3,7 +3,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > - SELECT xk_search_transfuse_bill.sid, xk_search_transfuse_bill.bill_no, xk_search_transfuse_bill.input_person, diff --git a/blood_bus_nurse/src/main/java/com/czblood/busNurse/pojo/VO/SampleInfoVO.java b/blood_bus_nurse/src/main/java/com/czblood/busNurse/pojo/VO/SampleInfoVO.java index 748644b..7051f6d 100644 --- a/blood_bus_nurse/src/main/java/com/czblood/busNurse/pojo/VO/SampleInfoVO.java +++ b/blood_bus_nurse/src/main/java/com/czblood/busNurse/pojo/VO/SampleInfoVO.java @@ -11,7 +11,7 @@ import java.util.Date; @NoArgsConstructor public class SampleInfoVO { private Date stime; - private Date end; + private Date etime; private String dept; private String sample_no; private String hgbz; diff --git a/sql/updatedb_blood.sql b/sql/updatedb_blood.sql index 3946554..7cab149 100644 --- a/sql/updatedb_blood.sql +++ b/sql/updatedb_blood.sql @@ -508,3 +508,8 @@ if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'xk_t END GO +if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'xk_search_transfuse_bill' AND COLUMN_NAME = 'hos_id') + BEGIN + alter table xk_search_transfuse_bill add hos_id varchar(10) + END +GO