From c05e58b7aac85f6435d240b3b7e55b35afaff22b Mon Sep 17 00:00:00 2001 From: LiJianZhao Date: Mon, 28 Apr 2025 12:59:20 +0800 Subject: [PATCH] deb --- .../common/config/ControllerAspect.java | 7 +++ .../social/SocialDirectoryController.java | 15 +++++- .../entity/diagnosis/dto/GoodsRetailDto.java | 2 +- .../entity/diagnosis/dto/ItemRetailDto.java | 51 +++++++++++++++++++ .../diagnosis/dto/MedicalRecordSaveDto.java | 2 +- .../diagnosis/MedicalRecordService.java | 13 +++-- .../service/inventory/InventoryService.java | 3 ++ .../patient/PatientRegistrationService.java | 7 +-- .../service/social/SocialItemService.java | 8 +++ 9 files changed, 96 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/ItemRetailDto.java diff --git a/src/main/java/com/syjiaer/clinic/server/common/config/ControllerAspect.java b/src/main/java/com/syjiaer/clinic/server/common/config/ControllerAspect.java index d259af2..4fcb30b 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/config/ControllerAspect.java +++ b/src/main/java/com/syjiaer/clinic/server/common/config/ControllerAspect.java @@ -35,6 +35,13 @@ public class ControllerAspect { result.setData(null); result.setCode(301); return result; + } catch (Exception e){ + Result result = new Result<>(); + result.setMessage("系统异常"); + result.setData(null); + result.setCode(101); + e.printStackTrace(); + return result; } } } \ No newline at end of file diff --git a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java index f9a9518..8d2cd9a 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java @@ -1,5 +1,6 @@ package com.syjiaer.clinic.server.controller.social; +import com.syjiaer.clinic.server.common.constants.Constants; import com.syjiaer.clinic.server.common.util.DictoryUtil; import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.common.vo.Result; @@ -130,7 +131,19 @@ public class SocialDirectoryController extends BaseController { } - + @RequestMapping("itemSearch") + public Result> itemSearch() { + String keyword = parmsUtil.getString("keyword","请输入搜索关键词"); + Integer pageNum = parmsUtil.getInteger("pageNum"); + Integer pageSize = parmsUtil.getInteger("pageSize"); + if (pageNum == null||pageNum <=0 ){ + pageNum=1; + } + if (pageSize == null||pageSize <=0){ + pageSize= Constants.DetailPageSize; + } + return success(socialItemService.pageList(pageNum,pageSize,keyword)); + } diff --git a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/GoodsRetailDto.java b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/GoodsRetailDto.java index ec63a40..c356ad6 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/GoodsRetailDto.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/GoodsRetailDto.java @@ -107,7 +107,7 @@ public class GoodsRetailDto { @ApiModelProperty("到期预警天数") private Integer expiryWarnDays; @ApiModelProperty("选择的数量") - private Integer selectNum; + private Integer selectedNum; @ApiModelProperty("选择的单位") private String selectedUnit; @ApiModelProperty("选择的价格") diff --git a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/ItemRetailDto.java b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/ItemRetailDto.java new file mode 100644 index 0000000..08de8d9 --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/ItemRetailDto.java @@ -0,0 +1,51 @@ +package com.syjiaer.clinic.server.entity.diagnosis.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Getter +@Setter +public class ItemRetailDto { + + @ApiModelProperty("自增主键") + private Integer id; + + @ApiModelProperty("项目创建时间") + private LocalDateTime createDatetime; + + @ApiModelProperty("项目创建人") + private String createBy; + + @ApiModelProperty("项目修改时间") + private LocalDateTime updateDatetime; + + @ApiModelProperty("项目修改人") + private String updateBy; + + @ApiModelProperty("项目名称") + private String itemName; + + @ApiModelProperty("项目医保目录编码") + private String itemSocialCode; + + @ApiModelProperty("单位") + private String unit; + + @ApiModelProperty("售价") + private BigDecimal unitPrice; + + @ApiModelProperty("进货价") + private BigDecimal purchaseUnitPrice; + + @ApiModelProperty("逻辑删除") + private Integer delFlag; + + @ApiModelProperty("数量") + private Integer selectedNum; + + +} diff --git a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/MedicalRecordSaveDto.java b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/MedicalRecordSaveDto.java index cf803e6..8a77205 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/MedicalRecordSaveDto.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/MedicalRecordSaveDto.java @@ -27,7 +27,7 @@ public class MedicalRecordSaveDto { @ApiModelProperty private DiagnosisMedicalRecord diagnosisMedicalRecord; @ApiModelProperty("服务项目列表") - private List itemList; + private List itemList; @ApiModelProperty("药品耗材列表") private List goodsList; } diff --git a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java index f00d225..498af4c 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java @@ -13,6 +13,7 @@ import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo; import com.syjiaer.clinic.server.entity.diagnosis.Diagnosis; import com.syjiaer.clinic.server.entity.diagnosis.dto.ChargeQueueQuery; +import com.syjiaer.clinic.server.entity.diagnosis.dto.ItemRetailDto; import com.syjiaer.clinic.server.entity.goods.Goods; import com.syjiaer.clinic.server.entity.item.Item; import com.syjiaer.clinic.server.entity.manager.ManagerUser; @@ -124,7 +125,7 @@ public class MedicalRecordService extends BaseService { Integer medicalRecordId = diagnosisMedicalRecord.getId(); List itemLists = new ArrayList<>(); - for (Item item : saveDto.getItemList()) { + for (ItemRetailDto item : saveDto.getItemList()) { Item dbItem = itemMapper.selectById(item.getId()); DiagnosisMedicalItemList itemDetail = new DiagnosisMedicalItemList(); itemDetail.setDiagnosisCode(code); @@ -133,7 +134,10 @@ public class MedicalRecordService extends BaseService { itemDetail.setSocialCode(dbItem.getItemSocialCode()); itemDetail.setUnit(dbItem.getUnit()); itemDetail.setUnitPrice(dbItem.getUnitPrice()); - itemDetail.setNumber(1); + if (item.getSelectedNum() == null ||item.getSelectedNum() <= 0){ + throw new MessageException("["+item.getItemName()+"]数量为0"); + } + itemDetail.setNumber(item.getSelectedNum()); itemLists.add(itemDetail); } @@ -149,7 +153,10 @@ public class MedicalRecordService extends BaseService { goodsDetail.setSocialCode(dbGoods.getHilistCode()); goodsDetail.setUnit(goodsRetailDto.getSelectedUnit()); goodsDetail.setUnitPrice(goodsRetailDto.getSelectedPrice()); - goodsDetail.setNumber(goodsRetailDto.getSelectNum()); + goodsDetail.setNumber(goodsRetailDto.getSelectedNum()); + if (goodsRetailDto.getSelectedNum() == null ||goodsRetailDto.getSelectedNum() <= 0){ + throw new MessageException("["+goodsRetailDto.getName()+"]数量为0"); + } goodsLists.add(goodsDetail); } diff --git a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java index 0bde82d..f5166bf 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java @@ -115,7 +115,10 @@ public class InventoryService extends BaseService { public List getListByGoodsId(int goodsId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("good_id", goodsId); + queryWrapper.ne("whole_number",0); + queryWrapper.ne("fragment_number",0); queryWrapper.orderByDesc("create_datetime"); + return inventoryMapper.selectList(queryWrapper); } diff --git a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java index 2abebb9..3ddda46 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java @@ -287,16 +287,11 @@ public class PatientRegistrationService extends BaseService { */ public void changeStatus(Integer regisId, Integer status) { RegistrationStatusEnum statusEnum = RegistrationStatusEnum.getByType(status); - if (statusEnum == null || statusEnum.equals(RegistrationStatusEnum.complete)){ - throw new MessageException("状态不存在"); - } + PatientRegistration patientRegistration = patientRegistrationMapper.selectById(regisId); if (patientRegistration == null){ throw new MessageException("挂号单不存在"); } - if (statusEnum.equals(RegistrationStatusEnum.inProgress) && !patientRegistration.getStatus().equals(RegistrationStatusEnum.waiting.getType())){ - throw new MessageException("初始状态不对"); - } if (statusEnum.equals(RegistrationStatusEnum.waiting) && !patientRegistration.getStatus().equals(RegistrationStatusEnum.inProgress.getType())){ throw new MessageException("初始状态不对"); } diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java index a1ab714..d5cedd8 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java @@ -99,4 +99,12 @@ public class SocialItemService extends BaseService { return resultPage; } + + + public Page pageList(Integer pageNum, Integer pageSize,String keyword) { + QueryWrapper codeqw = new QueryWrapper<>(); + codeqw.like("name", keyword); + codeqw.or().like("code", keyword); + return pageHelper(pageNum, pageSize, codeqw, socialItemMapper, "id", false); + } }