diff --git a/blood_bus/src/main/java/com/czblood/bus/constants/BloodSysLogConstants.java b/blood_bus/src/main/java/com/czblood/bus/constants/BloodSysLogConstants.java index b68cedf..0568d59 100644 --- a/blood_bus/src/main/java/com/czblood/bus/constants/BloodSysLogConstants.java +++ b/blood_bus/src/main/java/com/czblood/bus/constants/BloodSysLogConstants.java @@ -12,4 +12,5 @@ public class BloodSysLogConstants { public static final String LOG_TYPE_SAMPLE_INFO = "样本信息"; public static final String LOG_TYPE_SEARCH_TRANSFUSEBILL_INFO = "申请单扫描登记"; public static final String LOG_TYPE_ACCEPT_SAMPLE_INFO = "标本接收"; + public static final String LOG_TYPE_SEND_SAMPLE_INFO = "标本送检"; } 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 f5c5e95..ddd9891 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 @@ -8,4 +8,5 @@ import java.util.Map; public interface SearchTransfuseBillMapper { List> queryList(XkSearchTransfuseBillVO xkSearchTransfuseBillVO); Integer getMaxSid(); + List> queryOne(String billNo); } 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 a7cf4dc..079d406 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 @@ -57,12 +57,12 @@ public class SearchTransfuseBillServiceImpl implements SearchTransfuseBillServic @Override public Result queryOne(String billNo) { - XkSearchTransfuseBill xkSearchTransfuseBill = xkSearchTransfuseBillMapper.queryOne(billNo); - return new Result("0","查询成功",xkSearchTransfuseBill); + List> mapList = searchTransfuseBillMapper.queryOne(billNo); + return new Result("0","查询成功",mapList); } /** - * 删除某个申请单 + * 取消扫描登记 * @param billNo * @return */ diff --git a/blood_bus_bloodbank/src/main/resources/mapper/SearchTransfuseBillMapper.xml b/blood_bus_bloodbank/src/main/resources/mapper/SearchTransfuseBillMapper.xml index d6987e6..828d7bb 100644 --- a/blood_bus_bloodbank/src/main/resources/mapper/SearchTransfuseBillMapper.xml +++ b/blood_bus_bloodbank/src/main/resources/mapper/SearchTransfuseBillMapper.xml @@ -39,4 +39,34 @@ + + + \ No newline at end of file diff --git a/blood_bus_nurse/src/main/java/com/czblood/busNurse/controller/SendSampleInfoController.java b/blood_bus_nurse/src/main/java/com/czblood/busNurse/controller/SendSampleInfoController.java new file mode 100644 index 0000000..528c8e1 --- /dev/null +++ b/blood_bus_nurse/src/main/java/com/czblood/busNurse/controller/SendSampleInfoController.java @@ -0,0 +1,50 @@ +package com.czblood.busNurse.controller; + +import com.czblood.bus.constants.BloodSysLogConstants; +import com.czblood.busNurse.pojo.VO.SendSampleInfoQueryVO; +import com.czblood.busNurse.pojo.VO.SendSampleInfoVO; +import com.czblood.busNurse.service.SendSampleInfoService; +import com.czblood.common.annotation.Log; +import com.czblood.common.core.controller.BaseController; +import com.czblood.common.core.domain.Result; +import com.czblood.common.enums.BusinessType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags = "标本送检") +@RestController +@RequestMapping("/bus/nurse/sendSampleInfo") +@Slf4j +public class SendSampleInfoController extends BaseController { + + @Resource + private SendSampleInfoService sendSampleInfoService; + + + @ApiOperation("查询样本信息列表") + @GetMapping("/queryList") + public Result queryList(SendSampleInfoQueryVO sendSampleInfoQueryVO) { + return sendSampleInfoService.queryList(sendSampleInfoQueryVO); + } + + @ApiOperation("查询单个样本信息") + @GetMapping("/queryOne") + public Result queryOne(String sampleNo){ + return sendSampleInfoService.queryOne(sampleNo); + } + + @Log(title = BloodSysLogConstants.LOG_TYPE_SEND_SAMPLE_INFO, businessType = BusinessType.INSERT) + @ApiOperation("标本送检") + @GetMapping("/sendSampleInfo") + public Result sendSampleInfo(SendSampleInfoVO sendSampleInfoVO){ + sendSampleInfoVO.setUserId(getUsername()); + return sendSampleInfoService.sendSampleInfo(sendSampleInfoVO); + } + +} diff --git a/blood_bus_nurse/src/main/java/com/czblood/busNurse/mapper/SendSampleInfoMapper.java b/blood_bus_nurse/src/main/java/com/czblood/busNurse/mapper/SendSampleInfoMapper.java new file mode 100644 index 0000000..fa23bef --- /dev/null +++ b/blood_bus_nurse/src/main/java/com/czblood/busNurse/mapper/SendSampleInfoMapper.java @@ -0,0 +1,10 @@ +package com.czblood.busNurse.mapper; + +import com.czblood.busNurse.pojo.VO.SendSampleInfoQueryVO; + +import java.util.List; +import java.util.Map; + +public interface SendSampleInfoMapper { + List> queryList(SendSampleInfoQueryVO sendSampleInfoQueryVO); +} diff --git a/blood_bus_nurse/src/main/java/com/czblood/busNurse/pojo/VO/SendSampleInfoQueryVO.java b/blood_bus_nurse/src/main/java/com/czblood/busNurse/pojo/VO/SendSampleInfoQueryVO.java new file mode 100644 index 0000000..1eea100 --- /dev/null +++ b/blood_bus_nurse/src/main/java/com/czblood/busNurse/pojo/VO/SendSampleInfoQueryVO.java @@ -0,0 +1,16 @@ +package com.czblood.busNurse.pojo.VO; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class SendSampleInfoQueryVO { + private String sampleNo; + private String stime; + private String etime; + private String dept; + private String status; +} diff --git a/blood_bus_nurse/src/main/java/com/czblood/busNurse/pojo/VO/SendSampleInfoVO.java b/blood_bus_nurse/src/main/java/com/czblood/busNurse/pojo/VO/SendSampleInfoVO.java new file mode 100644 index 0000000..400446b --- /dev/null +++ b/blood_bus_nurse/src/main/java/com/czblood/busNurse/pojo/VO/SendSampleInfoVO.java @@ -0,0 +1,20 @@ +package com.czblood.busNurse.pojo.VO; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Api(tags = "标本送检VO") +public class SendSampleInfoVO { + private String sampleNo; + @ApiModelProperty("送检人") + private String sendMan; + @ApiModelProperty("运送人") + private String sendPerson; + private String userId; +} diff --git a/blood_bus_nurse/src/main/java/com/czblood/busNurse/service/SendSampleInfoService.java b/blood_bus_nurse/src/main/java/com/czblood/busNurse/service/SendSampleInfoService.java new file mode 100644 index 0000000..aa767db --- /dev/null +++ b/blood_bus_nurse/src/main/java/com/czblood/busNurse/service/SendSampleInfoService.java @@ -0,0 +1,13 @@ +package com.czblood.busNurse.service; + +import com.czblood.busNurse.pojo.VO.SendSampleInfoQueryVO; +import com.czblood.busNurse.pojo.VO.SendSampleInfoVO; +import com.czblood.common.core.domain.Result; + +public interface SendSampleInfoService { + Result queryList(SendSampleInfoQueryVO sendSampleInfoQueryVO); + + Result queryOne(String billNo); + + Result sendSampleInfo(SendSampleInfoVO sendSampleInfoVO); +} diff --git a/blood_bus_nurse/src/main/java/com/czblood/busNurse/service/impl/SendSampleInfoServiceImpl.java b/blood_bus_nurse/src/main/java/com/czblood/busNurse/service/impl/SendSampleInfoServiceImpl.java new file mode 100644 index 0000000..15bc9d4 --- /dev/null +++ b/blood_bus_nurse/src/main/java/com/czblood/busNurse/service/impl/SendSampleInfoServiceImpl.java @@ -0,0 +1,61 @@ +package com.czblood.busNurse.service.impl; + +import com.czblood.bus.mapper.XkSampleInfoMapper; +import com.czblood.bus.pojo.XkSampleInfo; +import com.czblood.bus.utils.BloodBankUtil; +import com.czblood.busNurse.mapper.SendSampleInfoMapper; +import com.czblood.busNurse.pojo.VO.SendSampleInfoQueryVO; +import com.czblood.busNurse.pojo.VO.SendSampleInfoVO; +import com.czblood.busNurse.service.SendSampleInfoService; +import com.czblood.common.core.domain.Result; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +@Service +public class SendSampleInfoServiceImpl implements SendSampleInfoService { + + @Resource + private SendSampleInfoMapper sendSampleInfoMapper; + @Resource + XkSampleInfoMapper xkSampleInfoMapper; + @Resource + BloodBankUtil bloodBankUtil; + + + @Override + public Result queryList(SendSampleInfoQueryVO sendSampleInfoQueryVO) { + List> mapList = sendSampleInfoMapper.queryList(sendSampleInfoQueryVO); + return new Result("0","查询成功",mapList); + } + + @Override + public Result queryOne(String sampleNo) { + XkSampleInfo xkSampleInfo = xkSampleInfoMapper.queryOne(sampleNo); + return new Result("0","查询成功",xkSampleInfo); + } + + /** + * 标本送出 + * @param sendSampleInfoVO + * @return + */ + @Override + public Result sendSampleInfo(SendSampleInfoVO sendSampleInfoVO) { + String sampleNo = sendSampleInfoVO.getSampleNo(); + XkSampleInfo xkSampleInfo = xkSampleInfoMapper.queryOne(sampleNo); + String sendNurse = BloodBankUtil.isBank(xkSampleInfo.getSend_Nurse()); + if(!sendNurse.equals("")) return new Result("-1","该标本已经送检!"); + XkSampleInfo xkSampleInfoTemp = new XkSampleInfo(); + xkSampleInfoTemp.setSend_Nurse(sendSampleInfoVO.getSendMan()); + xkSampleInfoTemp.setSendperson(sendSampleInfoVO.getSendPerson()); + xkSampleInfoTemp.setSample_status("4"); + xkSampleInfoTemp.setSend_Date(bloodBankUtil.getCurrentTimeDate()); + xkSampleInfoTemp.setSample_No(sendSampleInfoVO.getSampleNo()); + xkSampleInfoMapper.update(xkSampleInfoTemp); + return new Result("0","送检成功"); + } + +} diff --git a/blood_bus_nurse/src/main/resources/mapper/SendSampleInfoMapper.xml b/blood_bus_nurse/src/main/resources/mapper/SendSampleInfoMapper.xml new file mode 100644 index 0000000..3e6b9fc --- /dev/null +++ b/blood_bus_nurse/src/main/resources/mapper/SendSampleInfoMapper.xml @@ -0,0 +1,37 @@ + + + + + \ No newline at end of file diff --git a/sql/updatedb_blood.sql b/sql/updatedb_blood.sql index 7cab149..3b7dd37 100644 --- a/sql/updatedb_blood.sql +++ b/sql/updatedb_blood.sql @@ -361,6 +361,14 @@ if not exists(select 1 from dbo.xk_dmzd where wordbook_sign = 'BASE') ('rhtype','-','-','Y'), ('rhtype','未知','未知','Y') + insert into xk_dmzd(wordbook_sign,wordbook_code,wordbook_name,use_sign) values('BASE','sampleStatus','样本状态','Y') + insert into xk_dmzd(wordbook_sign,wordbook_code,wordbook_name,use_sign) values + ('sampleStatus','1','打印条码','Y'), + ('sampleStatus','2','已采样','Y'), + ('sampleStatus','3','已送检','Y'), + ('sampleStatus','4','已签收','Y'), + ('sampleStatus','5','复核血型','Y') + END IF NOT EXISTS (SELECT 1 FROM sys.key_constraints WHERE name = 'PK_xk_dmzd' AND type = 'PK' )