diff --git a/.idea/MarsCodeWorkspaceAppSettings.xml b/.idea/MarsCodeWorkspaceAppSettings.xml index b26fdc6..81f2d8c 100644 --- a/.idea/MarsCodeWorkspaceAppSettings.xml +++ b/.idea/MarsCodeWorkspaceAppSettings.xml @@ -2,6 +2,6 @@ \ No newline at end of file diff --git a/blood_bus/src/main/java/com/czblood/bus/controller/BloodCommonController.java b/blood_bus/src/main/java/com/czblood/bus/controller/BloodCommonController.java index fc8790f..fa369c0 100644 --- a/blood_bus/src/main/java/com/czblood/bus/controller/BloodCommonController.java +++ b/blood_bus/src/main/java/com/czblood/bus/controller/BloodCommonController.java @@ -1,11 +1,15 @@ package com.czblood.bus.controller; import com.czblood.bus.mapper.XkProTransfuseProjectMapper; +import com.czblood.bus.mapper.XkXtwhIllDiagnoseMapper; import com.czblood.bus.pojo.XkBloodBreed; import com.czblood.bus.pojo.XkDmzd; import com.czblood.bus.pojo.XkProTransfuseProject; +import com.czblood.bus.pojo.XkXtwhIllDiagnose; import com.czblood.bus.utils.BloodBankUtil; +import com.czblood.common.core.controller.BaseController; import com.czblood.common.core.domain.Result; +import com.czblood.common.core.page.TableDataInfo; import com.czblood.system.util.CommonUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,7 +21,7 @@ import java.util.List; @Api(tags = "公共接口") @RestController @RequestMapping("/bus/common") -public class BloodCommonController { +public class BloodCommonController extends BaseController { @Resource private XkProTransfuseProjectMapper xkProTransfuseProjectMapper; @@ -25,6 +29,8 @@ public class BloodCommonController { private BloodBankUtil bloodBankUtil; @Resource CommonUtil commonUtil; + @Resource + XkXtwhIllDiagnoseMapper xkXtwhIllDiagnoseMapper; @ApiOperation("获取输血前检验项目") @PostMapping("/queryLisProject") @@ -65,6 +71,14 @@ public class BloodCommonController { public Result getBloodBreed(){ List bloodBreedList = bloodBankUtil.getBloodBreed(); return new Result("0","获取数据成功！",bloodBreedList); - } + + @ApiOperation("查询诊断信息") + @GetMapping("/queryDiagnose") + public TableDataInfo queryDiagnose(XkXtwhIllDiagnose xkXtwhIllDiagnose){ + startPage(); + List xkXtwhIllDiagnoseList = xkXtwhIllDiagnoseMapper.queryList(xkXtwhIllDiagnose); + return getDataTable(xkXtwhIllDiagnoseList); + } + } diff --git a/blood_bus/src/main/java/com/czblood/bus/mapper/XkTransfuseApplyBloodbreedMapper.java b/blood_bus/src/main/java/com/czblood/bus/mapper/XkTransfuseApplyBloodbreedMapper.java index b759675..72ab56d 100644 --- a/blood_bus/src/main/java/com/czblood/bus/mapper/XkTransfuseApplyBloodbreedMapper.java +++ b/blood_bus/src/main/java/com/czblood/bus/mapper/XkTransfuseApplyBloodbreedMapper.java @@ -6,4 +6,5 @@ import java.util.List; public interface XkTransfuseApplyBloodbreedMapper { List queryList(XkTransfuseApplyBloodbreed xkTransfuseApplyBloodbreed); + List queryOne(String bill_no); } diff --git a/blood_bus/src/main/java/com/czblood/bus/mapper/XkXtwhIllDiagnoseMapper.java b/blood_bus/src/main/java/com/czblood/bus/mapper/XkXtwhIllDiagnoseMapper.java new file mode 100644 index 0000000..f19359f --- /dev/null +++ b/blood_bus/src/main/java/com/czblood/bus/mapper/XkXtwhIllDiagnoseMapper.java @@ -0,0 +1,9 @@ +package com.czblood.bus.mapper; + +import com.czblood.bus.pojo.XkXtwhIllDiagnose; + +import java.util.List; + +public interface XkXtwhIllDiagnoseMapper { + List queryList(XkXtwhIllDiagnose xkXtwhIllDiagnose); +} diff --git a/blood_bus/src/main/java/com/czblood/bus/mapper/XkXtwhIllMapper.java b/blood_bus/src/main/java/com/czblood/bus/mapper/XkXtwhIllMapper.java new file mode 100644 index 0000000..c751d4a --- /dev/null +++ b/blood_bus/src/main/java/com/czblood/bus/mapper/XkXtwhIllMapper.java @@ -0,0 +1,9 @@ +package com.czblood.bus.mapper; + +import com.czblood.bus.pojo.XkXtwhIll; + +import java.util.List; + +public interface XkXtwhIllMapper { + List queryList(XkXtwhIll xkXtwhIll); +} diff --git a/blood_bus/src/main/java/com/czblood/bus/pojo/XkXtwhIllDiagnose.java b/blood_bus/src/main/java/com/czblood/bus/pojo/XkXtwhIllDiagnose.java new file mode 100644 index 0000000..87435fc --- /dev/null +++ b/blood_bus/src/main/java/com/czblood/bus/pojo/XkXtwhIllDiagnose.java @@ -0,0 +1,18 @@ +package com.czblood.bus.pojo; + +import io.swagger.annotations.ApiModel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@ApiModel("疾病诊断") +public class XkXtwhIllDiagnose { + private String Ill_Code; + private String Dia_Code; + private String Dia_Name; + private String Dia_Pym; + private String Remark; +} diff --git a/blood_bus/src/main/resources/mapper/XkTransfuseApplyBloodbreedMapper.xml b/blood_bus/src/main/resources/mapper/XkTransfuseApplyBloodbreedMapper.xml index 247ca20..7583f10 100644 --- a/blood_bus/src/main/resources/mapper/XkTransfuseApplyBloodbreedMapper.xml +++ b/blood_bus/src/main/resources/mapper/XkTransfuseApplyBloodbreedMapper.xml @@ -6,4 +6,7 @@ select * from xk_transfuse_apply_bloodbreed where bill_no = #{bill_no} and blood_breed = #{blood_breed} + \ No newline at end of file diff --git a/blood_bus/src/main/resources/mapper/XkXtwhIllDiagnoseMapper.xml b/blood_bus/src/main/resources/mapper/XkXtwhIllDiagnoseMapper.xml new file mode 100644 index 0000000..c774e1e --- /dev/null +++ b/blood_bus/src/main/resources/mapper/XkXtwhIllDiagnoseMapper.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/blood_bus/src/main/resources/mapper/XkXtwhIllMapper.xml b/blood_bus/src/main/resources/mapper/XkXtwhIllMapper.xml new file mode 100644 index 0000000..4ac5db5 --- /dev/null +++ b/blood_bus/src/main/resources/mapper/XkXtwhIllMapper.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/controller/XkXtwhIllController.java b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/controller/XkXtwhIllController.java new file mode 100644 index 0000000..fad4fcf --- /dev/null +++ b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/controller/XkXtwhIllController.java @@ -0,0 +1,28 @@ +package com.czblood.busBloodbank.controller; + +import com.czblood.bus.pojo.XkXtwhIll; +import com.czblood.busBloodbank.service.XkXtwhIllService; +import com.czblood.common.core.domain.Result; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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/bloodbank/ill") +public class XkXtwhIllController { + + @Resource + XkXtwhIllService xkXtwhIllService; + + + @ApiOperation("单病种查询") + @GetMapping("/queryList") + public Result queryList(XkXtwhIll xkXtwhIll) { + return xkXtwhIllService.queryList(xkXtwhIll); + } +} diff --git a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/XkXtwhIllService.java b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/XkXtwhIllService.java new file mode 100644 index 0000000..69643ca --- /dev/null +++ b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/XkXtwhIllService.java @@ -0,0 +1,8 @@ +package com.czblood.busBloodbank.service; + +import com.czblood.bus.pojo.XkXtwhIll; +import com.czblood.common.core.domain.Result; + +public interface XkXtwhIllService { + Result queryList(XkXtwhIll xkXtwhIll); +} diff --git a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/XkXtwhIllServiceImpl.java b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/XkXtwhIllServiceImpl.java new file mode 100644 index 0000000..8975cc8 --- /dev/null +++ b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/XkXtwhIllServiceImpl.java @@ -0,0 +1,23 @@ +package com.czblood.busBloodbank.service.impl; + +import com.czblood.bus.mapper.XkXtwhIllMapper; +import com.czblood.bus.pojo.XkXtwhIll; +import com.czblood.busBloodbank.service.XkXtwhIllService; +import com.czblood.common.core.domain.Result; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class XkXtwhIllServiceImpl implements XkXtwhIllService { + + @Resource + XkXtwhIllMapper xkXtwhIllMapper; + + @Override + public Result queryList(XkXtwhIll xkXtwhIll) { + List list = xkXtwhIllMapper.queryList(xkXtwhIll); + return new Result("0","查询成功！",list); + } +} diff --git a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/controller/TransfuseApplyBeforeController.java b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/controller/TransfuseApplyBeforeController.java index c477a8e..6c53ef3 100644 --- a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/controller/TransfuseApplyBeforeController.java +++ b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/controller/TransfuseApplyBeforeController.java @@ -1,9 +1,8 @@ package com.czblood.busDoctor.controller; import com.czblood.bus.constants.BloodSysLogConstants; -import com.czblood.bus.pojo.XkTransfuseApplyBefore; -import com.czblood.busDoctor.pojo.TransfuseApplyBeforeDTO; -import com.czblood.busDoctor.pojo.TransfuseApplyBeforeVO; +import com.czblood.busDoctor.pojo.DTO.TransfuseApplyBeforeDTO; +import com.czblood.busDoctor.pojo.VO.TransfuseApplyBeforeVO; import com.czblood.busDoctor.service.TransfuseApplyBeforeService; import com.czblood.common.annotation.Log; import com.czblood.common.core.controller.BaseController; diff --git a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/controller/TransfuseApplyController.java b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/controller/TransfuseApplyController.java index b1114de..2e18359 100644 --- a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/controller/TransfuseApplyController.java +++ b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/controller/TransfuseApplyController.java @@ -1,8 +1,12 @@ package com.czblood.busDoctor.controller; -import com.czblood.bus.pojo.XkTransfuseApply; + +import com.czblood.bus.pojo.XkXtwhIllDiagnose; +import com.czblood.busDoctor.pojo.VO.TransfuseApplyVO; import com.czblood.busDoctor.service.TransfuseApplyService; +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 lombok.extern.slf4j.Slf4j; @@ -19,7 +23,7 @@ import javax.annotation.Resource; @RestController @RequestMapping("/bus/doctor/apply") @Slf4j -public class TransfuseApplyController { +public class TransfuseApplyController extends BaseController { @Resource private TransfuseApplyService transfuseApplyService; @@ -28,21 +32,27 @@ public class TransfuseApplyController { @ApiOperation("查询申请单列表") @GetMapping("/queryList") - public Result queryList(XkTransfuseApply xkTransfuseApply){ - return transfuseApplyService.queryList(xkTransfuseApply); + public Result queryList(TransfuseApplyVO transfuseApplyVO){ + return transfuseApplyService.queryList(transfuseApplyVO); } @ApiOperation("获取病人信息") @GetMapping("/getPatInfo") - public Result getPatInfo(String beinhosId){ - return transfuseApplyService.getPatInfo(beinhosId); + public Result getPatInfo(TransfuseApplyVO transfuseApplyVO){ + return transfuseApplyService.getPatInfo(transfuseApplyVO); } - @ApiOperation("获取申请单明细") - @GetMapping("/queryDetail") - public Result queryDetail(){ - return null; + @ApiOperation("查询输血前评估信息列表") + @GetMapping("/queryApplyBeforeList") + public Result queryApplyBeforeList(String dept_id,String user_id){ + return transfuseApplyService.queryApplyBeforeList(dept_id,user_id); + } + + @ApiOperation("查询单条申请单") + @GetMapping("/queryApplyOne") + public Result queryApplyOne(String billNo){ + return transfuseApplyService.queryApplyOne(billNo); } diff --git a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/mapper/TransfuseApplyBeforeMapper.java b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/mapper/TransfuseApplyBeforeMapper.java index 6d61fe9..2fb05bc 100644 --- a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/mapper/TransfuseApplyBeforeMapper.java +++ b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/mapper/TransfuseApplyBeforeMapper.java @@ -1,6 +1,6 @@ package com.czblood.busDoctor.mapper; -import com.czblood.busDoctor.pojo.TransfuseApplyBeforeVO; +import com.czblood.busDoctor.pojo.VO.TransfuseApplyBeforeVO; import java.util.List; import java.util.Map; diff --git a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/mapper/TransfuseApplyMapper.java b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/mapper/TransfuseApplyMapper.java new file mode 100644 index 0000000..a6e1440 --- /dev/null +++ b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/mapper/TransfuseApplyMapper.java @@ -0,0 +1,16 @@ +package com.czblood.busDoctor.mapper; + + +import com.czblood.busDoctor.pojo.VO.TransfuseApplyVO; +import org.apache.ibatis.annotations.MapKey; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +public interface TransfuseApplyMapper { + List> queryList(TransfuseApplyVO transfuseApplyVO); + @MapKey("bill_no") + Map queryApplyOne(TransfuseApplyVO transfuseApplyVO); + List> queryApplyBeforeList(@Param("dept_id") String dept_id,@Param("assess_person") String assess_person); +} diff --git a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/pojo/TransfuseApplyBeforeDTO.java b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/pojo/DTO/TransfuseApplyBeforeDTO.java similarity index 89% rename from blood_bus_doctor/src/main/java/com/czblood/busDoctor/pojo/TransfuseApplyBeforeDTO.java rename to blood_bus_doctor/src/main/java/com/czblood/busDoctor/pojo/DTO/TransfuseApplyBeforeDTO.java index f444bdd..f622d37 100644 --- a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/pojo/TransfuseApplyBeforeDTO.java +++ b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/pojo/DTO/TransfuseApplyBeforeDTO.java @@ -1,7 +1,6 @@ -package com.czblood.busDoctor.pojo; +package com.czblood.busDoctor.pojo.DTO; import com.czblood.bus.pojo.*; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/pojo/DTO/TransfuseApplyDTO.java b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/pojo/DTO/TransfuseApplyDTO.java new file mode 100644 index 0000000..a227e6d --- /dev/null +++ b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/pojo/DTO/TransfuseApplyDTO.java @@ -0,0 +1,26 @@ +package com.czblood.busDoctor.pojo.DTO; + +import com.czblood.bus.pojo.XkTransfuseApply; +import com.czblood.bus.pojo.XkTransfuseApplyBloodbreed; +import com.czblood.bus.pojo.XkTransfuseApplyTestitem; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; +import java.util.Map; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class TransfuseApplyDTO { + @ApiModelProperty("输血申请单列表信息") + private List> transfuseApplyList; + @ApiModelProperty("输血申请单信息") + private Map transfuseApplyMap; + @ApiModelProperty(value = "输血前lis检查项目") + private List xkTransfuseApplyTestitemList; + @ApiModelProperty("输血申请单品种列表") + private List xkTransfuseApplyBloodbreedList; +} diff --git a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/pojo/TransfuseApplyBeforeVO.java b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/pojo/VO/TransfuseApplyBeforeVO.java similarity index 90% rename from blood_bus_doctor/src/main/java/com/czblood/busDoctor/pojo/TransfuseApplyBeforeVO.java rename to blood_bus_doctor/src/main/java/com/czblood/busDoctor/pojo/VO/TransfuseApplyBeforeVO.java index 274b75b..8ae9768 100644 --- a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/pojo/TransfuseApplyBeforeVO.java +++ b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/pojo/VO/TransfuseApplyBeforeVO.java @@ -1,6 +1,5 @@ -package com.czblood.busDoctor.pojo; +package com.czblood.busDoctor.pojo.VO; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/pojo/VO/TransfuseApplyVO.java b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/pojo/VO/TransfuseApplyVO.java new file mode 100644 index 0000000..29ee2f9 --- /dev/null +++ b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/pojo/VO/TransfuseApplyVO.java @@ -0,0 +1,22 @@ +package com.czblood.busDoctor.pojo.VO; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class TransfuseApplyVO { + @ApiModelProperty("单据状态") + private String bill_status; + @ApiModelProperty("查询多少天之前的") + private Integer day; + @ApiModelProperty("查询的科室") + private String dept_code; + @ApiModelProperty("查询的医生") + private String doctor_code; + @ApiModelProperty("查询的单据编号") + private String bill_no; +} diff --git a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/service/TransfuseApplyBeforeService.java b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/service/TransfuseApplyBeforeService.java index c0269b9..f68d360 100644 --- a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/service/TransfuseApplyBeforeService.java +++ b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/service/TransfuseApplyBeforeService.java @@ -1,8 +1,7 @@ package com.czblood.busDoctor.service; -import com.czblood.bus.pojo.XkTransfuseApplyBefore; -import com.czblood.busDoctor.pojo.TransfuseApplyBeforeDTO; -import com.czblood.busDoctor.pojo.TransfuseApplyBeforeVO; +import com.czblood.busDoctor.pojo.DTO.TransfuseApplyBeforeDTO; +import com.czblood.busDoctor.pojo.VO.TransfuseApplyBeforeVO; import com.czblood.common.core.domain.Result; public interface TransfuseApplyBeforeService { diff --git a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/service/TransfuseApplyService.java b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/service/TransfuseApplyService.java index df020d4..33660ad 100644 --- a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/service/TransfuseApplyService.java +++ b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/service/TransfuseApplyService.java @@ -1,10 +1,15 @@ package com.czblood.busDoctor.service; import com.czblood.bus.pojo.XkTransfuseApply; +import com.czblood.busDoctor.pojo.VO.TransfuseApplyVO; import com.czblood.common.core.domain.Result; public interface TransfuseApplyService { - Result getPatInfo(String beinhosId); + Result getPatInfo(TransfuseApplyVO transfuseApplyVO); - Result queryList(XkTransfuseApply xkTransfuseApply); + Result queryList(TransfuseApplyVO transfuseApplyVO); + + Result queryApplyOne(String billNo); + + Result queryApplyBeforeList(String dept_id,String assess_person); } diff --git a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/service/impl/TransfuseApplyBeforeServiceImpl.java b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/service/impl/TransfuseApplyBeforeServiceImpl.java index 2ba00c9..29d7011 100644 --- a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/service/impl/TransfuseApplyBeforeServiceImpl.java +++ b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/service/impl/TransfuseApplyBeforeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.json.JSONUtil; import com.czblood.bus.constants.BloodPrintTypeConstants; import com.czblood.bus.mapper.XkPatientInfoMapper; import com.czblood.bus.mapper.XkTransfuseApplyBeforeMapper; -import com.czblood.bus.mapper.XkTransfuseApplyMapper; import com.czblood.bus.mapper.XkTransfuseApplyTestitemMapper; import com.czblood.bus.pojo.*; import com.czblood.bus.pojo.inter.BeforeAssessRequest; @@ -16,8 +15,8 @@ import com.czblood.bus.utils.BloodBankUtil; import com.czblood.bus.utils.BloodInterfaceUtil; import com.czblood.bus.utils.ReportUtil; import com.czblood.busDoctor.mapper.TransfuseApplyBeforeMapper; -import com.czblood.busDoctor.pojo.TransfuseApplyBeforeDTO; -import com.czblood.busDoctor.pojo.TransfuseApplyBeforeVO; +import com.czblood.busDoctor.pojo.DTO.TransfuseApplyBeforeDTO; +import com.czblood.busDoctor.pojo.VO.TransfuseApplyBeforeVO; import com.czblood.busDoctor.service.TransfuseApplyBeforeService; import com.czblood.busDoctor.utils.TransfuseApplyBeforeUtil; import com.czblood.common.config.RuoYiConfig; @@ -25,7 +24,6 @@ import com.czblood.common.core.domain.Result; import com.czblood.common.utils.file.FileUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.io.File; diff --git a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/service/impl/TransfuseApplyServiceImpl.java b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/service/impl/TransfuseApplyServiceImpl.java index 52b35f6..10662e7 100644 --- a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/service/impl/TransfuseApplyServiceImpl.java +++ b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/service/impl/TransfuseApplyServiceImpl.java @@ -1,24 +1,92 @@ package com.czblood.busDoctor.service.impl; -import com.czblood.bus.pojo.XkTransfuseApply; +import com.czblood.bus.mapper.XkPatientInfoMapper; +import com.czblood.bus.mapper.XkTransfuseApplyBeforeMapper; +import com.czblood.bus.mapper.XkTransfuseApplyBloodbreedMapper; +import com.czblood.bus.mapper.XkTransfuseApplyTestitemMapper; +import com.czblood.bus.pojo.*; +import com.czblood.busDoctor.mapper.TransfuseApplyMapper; +import com.czblood.busDoctor.pojo.DTO.TransfuseApplyDTO; +import com.czblood.busDoctor.pojo.VO.TransfuseApplyVO; import com.czblood.busDoctor.service.TransfuseApplyService; import com.czblood.common.core.domain.Result; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + @Service @Slf4j public class TransfuseApplyServiceImpl implements TransfuseApplyService { + @Resource + TransfuseApplyMapper transfuseApplyMapper; + @Resource + XkTransfuseApplyTestitemMapper xkTransfuseApplyTestitemMapper; + @Resource + XkTransfuseApplyBloodbreedMapper xkTransfuseApplyBloodbreedMapper; + @Resource + XkTransfuseApplyBeforeMapper xkTransfuseApplyBeforeMapper; + @Resource + XkPatientInfoMapper xkPatientInfoMapper; + + /** + * 获取病人信息 + * + * @param transfuseApplyVO + * @return + */ @Override - public Result getPatInfo(String beinhosId) { + public Result getPatInfo(TransfuseApplyVO transfuseApplyVO) { + //获取输血前评估单对应的病人信息 + String billNo = transfuseApplyVO.getBill_no(); + if (billNo == null || billNo.equals("")) return new Result("-1", "查询的申请单号不能为空！"); + XkTransfuseApplyBefore xkTransfuseApplyBefore = xkTransfuseApplyBeforeMapper.queryOne(billNo); + if (xkTransfuseApplyBefore != null) return new Result("-1", "没有查到对应的输血评估单！"); + String beinhosId = xkTransfuseApplyBefore.getBeinhos_id(); + XkPatientInfo xkPatientInfo = xkPatientInfoMapper.queryOne(beinhosId); + if (xkPatientInfo != null) return new Result("-1"," 没有查到对应的病人信息！"); + //将输血评估的信息写入到输血申请单 + XkTransfuseApply xkTransfuseApply = new XkTransfuseApply(); + xkTransfuseApply.setBeinhos_id(beinhosId); + return null; } @Override - public Result queryList(XkTransfuseApply xkTransfuseApply) { - return null; + public Result queryList(TransfuseApplyVO transfuseApplyVO) { + Integer day = transfuseApplyVO.getDay(); + if (day == null || day == 0) return new Result("-1", "查询天数不能为空！"); + List> transfuseApplyList = transfuseApplyMapper.queryList(transfuseApplyVO); + return new Result("0", "查询成功", transfuseApplyList); + } + + @Override + public Result queryApplyOne(String billNo) { + TransfuseApplyVO transfuseApplyVO = new TransfuseApplyVO(); + transfuseApplyVO.setBill_no(billNo); + Map transfuseApplyMap = transfuseApplyMapper.queryApplyOne(transfuseApplyVO); + TransfuseApplyDTO transfuseApplyDTO = new TransfuseApplyDTO(); + transfuseApplyDTO.setTransfuseApplyMap(transfuseApplyMap); + List xkTransfuseApplyTestitemList = xkTransfuseApplyTestitemMapper.queryList(billNo); + transfuseApplyDTO.setXkTransfuseApplyTestitemList(xkTransfuseApplyTestitemList); + List xkTransfuseApplyBloodbreedList = xkTransfuseApplyBloodbreedMapper.queryOne(billNo); + transfuseApplyDTO.setXkTransfuseApplyBloodbreedList(xkTransfuseApplyBloodbreedList); + return new Result("0", "查询成功", transfuseApplyDTO); + } + + /** + * 查询输血前评估信息列表 + * + * @return + */ + @Override + public Result queryApplyBeforeList(String dept_id, String assess_person) { + List> transfuseApplyBeforeList = transfuseApplyMapper.queryApplyBeforeList(dept_id, assess_person); + return new Result("0", "查询成功", transfuseApplyBeforeList); } } diff --git a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/utils/TransfuseApplyBeforeUtil.java b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/utils/TransfuseApplyBeforeUtil.java index be908c0..e0b59a6 100644 --- a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/utils/TransfuseApplyBeforeUtil.java +++ b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/utils/TransfuseApplyBeforeUtil.java @@ -6,7 +6,7 @@ import com.czblood.bus.mapper.XkTransfuseApplyTestitemMapper; import com.czblood.bus.pojo.XkPatientInfo; import com.czblood.bus.pojo.XkTransfuseApplyBefore; import com.czblood.bus.pojo.XkTransfuseApplyTestitem; -import com.czblood.busDoctor.pojo.TransfuseApplyBeforeDTO; +import com.czblood.busDoctor.pojo.DTO.TransfuseApplyBeforeDTO; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/utils/TransfuseApplyUtil.java b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/utils/TransfuseApplyUtil.java new file mode 100644 index 0000000..0592bab --- /dev/null +++ b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/utils/TransfuseApplyUtil.java @@ -0,0 +1,14 @@ +package com.czblood.busDoctor.utils; + +import org.springframework.stereotype.Component; + +@Component +public class TransfuseApplyUtil { + + /** + * 计算大量用血 + */ + public void computeLargeBlood(){ + + } +} diff --git a/blood_bus_doctor/src/main/resources/mapper/TransfuseApplyMapper.xml b/blood_bus_doctor/src/main/resources/mapper/TransfuseApplyMapper.xml new file mode 100644 index 0000000..3621320 --- /dev/null +++ b/blood_bus_doctor/src/main/resources/mapper/TransfuseApplyMapper.xml @@ -0,0 +1,112 @@ + + + + + + + \ No newline at end of file diff --git a/sql/updatedb_blood.sql b/sql/updatedb_blood.sql index 724c097..b5e88c2 100644 --- a/sql/updatedb_blood.sql +++ b/sql/updatedb_blood.sql @@ -325,6 +325,25 @@ if not exists(select 1 from dbo.xk_dmzd where wordbook_sign = 'BASE') ('workgroup','004','医生','Y'), ('workgroup','005','支助中心','Y') + insert into xk_dmzd(wordbook_sign,wordbook_code,wordbook_name,use_sign) values('BASE','depttype','科室类型','Y') + insert into xk_dmzd(wordbook_sign,wordbook_code,wordbook_name,use_sign) values + ('depttype','A','手术科室','Y'), + ('depttype','B','非手术科室','Y') + + insert into xk_dmzd(wordbook_sign,wordbook_code,wordbook_name,use_sign) values('BASE','operatype','手术科室类型','Y') + insert into xk_dmzd(wordbook_sign,wordbook_code,wordbook_name,use_sign) values + ('operatype','术前','术前','Y'), + ('operatype','术中','术中','Y'), + ('operatype','术后','术后','Y'), + ('operatype','无','无','Y') + + insert into xk_dmzd(wordbook_sign,wordbook_code,wordbook_name,use_sign) values('BASE','nooperatype','非手术科室类型','Y') + insert into xk_dmzd(wordbook_sign,wordbook_code,wordbook_name,use_sign) values + ('nooperatype','无','无','Y'), + ('nooperatype','慢性贫血','慢性贫血','Y'), + ('nooperatype','急性失血','急性失血','Y'), + ('nooperatype','新生儿科','新生儿科','Y') + END @@ -405,5 +424,27 @@ if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_ alter table sys_dept add hos_id varchar(10) end go +if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'xk_transfuse_apply' AND COLUMN_NAME = 'operation_name') + begin + alter table xk_transfuse_apply add operation_name varchar(200) + end +go +if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'xk_transfuse_apply' AND COLUMN_NAME = 'operation_level') + begin + alter table xk_transfuse_apply add operation_level varchar(10) + end +go + +if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'xk_transfuse_apply' AND COLUMN_NAME = 'card_no') + begin + alter table xk_transfuse_apply add card_no varchar(50) + end +go + +if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'xk_patient_info' AND COLUMN_NAME = 'beinhos_number') + begin + alter table xk_patient_info add beinhos_number varchar(50) + end +go