From cf0cd6834b13afe134f65effa15e3575810696ff Mon Sep 17 00:00:00 2001 From: LiJianZhao Date: Tue, 13 May 2025 16:59:40 +0800 Subject: [PATCH] dev --- .../controller/goods/GoodsController.java | 4 ++-- .../social/SocialDirectoryController.java | 7 +++++++ .../clinic/server/entity/goods/Goods.java | 2 ++ .../entity/patient/vo/SeeDoctorInfoVo.java | 3 +++ .../diagnosis/MedicalRecordService.java | 1 + .../server/service/goods/GoodsService.java | 2 +- .../service/social/SocialDirectoryService.java | 18 ++++++++++++++++++ 7 files changed, 34 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java b/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java index 047a977..f51d0fa 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java @@ -69,8 +69,8 @@ public class GoodsController extends BaseController { if (goods.getMinPackagingNumber() == null || goods.getMinPackagingNumber() <= 0){ return error("最小包装数量只能为正数"); } - if (goods.getIdCode() != null && goods.getIdCode().isEmpty()){ - goods.setIdCode(null); + if (goods.getIdCode() == null || goods.getIdCode().isEmpty()){ + goods.setIdCode(""); } Goods dbGoods = goodsService.createGoods(goods); 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 b4d923a..f52e600 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 @@ -54,6 +54,13 @@ public class SocialDirectoryController extends BaseController { return success(socialDirectoryService.search(keyword, type, page, size)); } + @RequestMapping("searchProducer") + public Result>> searchProducer() { + String keyword = parmsUtil.getString("keyword","请输入搜索关键词"); + Integer type= parmsUtil.getInteger("type"); + return success(socialDirectoryService.searchProducer(keyword, type)); + + } @RequestMapping("getByCode") public Result getByCode() { String code = parmsUtil.getString("code"); diff --git a/src/main/java/com/syjiaer/clinic/server/entity/goods/Goods.java b/src/main/java/com/syjiaer/clinic/server/entity/goods/Goods.java index 486e263..bc9a821 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/goods/Goods.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/goods/Goods.java @@ -1,6 +1,8 @@ package com.syjiaer.clinic.server.entity.goods; +import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/patient/vo/SeeDoctorInfoVo.java b/src/main/java/com/syjiaer/clinic/server/entity/patient/vo/SeeDoctorInfoVo.java index 3c7ca01..8382fca 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/patient/vo/SeeDoctorInfoVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/patient/vo/SeeDoctorInfoVo.java @@ -13,6 +13,8 @@ public class SeeDoctorInfoVo { private Integer dockerId; //挂号医生姓名 private String dockerName; + //挂号类型 + private Integer registerType; //医生科室名称 private String sectionName; //上一次接诊时间 @@ -21,4 +23,5 @@ public class SeeDoctorInfoVo { private Integer seeDoctorCount; //医保余额 private BigDecimal socialBalance; + } 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 be35ffc..07d70a7 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 @@ -379,6 +379,7 @@ public class MedicalRecordService extends BaseService { throw new MessageException("挂号单不存在"); } SeeDoctorInfoVo vo = new SeeDoctorInfoVo(); + vo.setRegisterType(registration.getType()); vo.setPatientInfo(patientInfoMapper.selectById(registration.getPatientInfoId())); OrganizationMember docker = organizationMemberMapper.selectById(registration.getOrganizationDoctorId()); diff --git a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java index 94ee970..6d1160d 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java @@ -350,7 +350,7 @@ public class GoodsService { throw new MessageException("商品不存在"); } List idCodeList = null; - if (dbGoods.getIdCode() == null) { + if (dbGoods.getIdCode() == null || dbGoods.getIdCode().isEmpty()) { idCodeList = new ArrayList<>(); } else { idCodeList = new ArrayList<>(Arrays.asList(dbGoods.getIdCode().split(","))); diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java index 4b5cf8b..a467056 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java @@ -414,4 +414,22 @@ public class SocialDirectoryService extends BaseService { } + public List> searchProducer(String keyword, Integer type) { + QueryWrapper codeqw = new QueryWrapper<>(); + codeqw.select("producer,count(1) as c"); + if (type != null) { + codeqw.eq("type", type); + } + //模糊搜索 + if (keyword != null && !keyword.trim().isEmpty()) { + codeqw.and(wrapper-> + wrapper.like("name", keyword).or().like("code", keyword).or().like("keyword", keyword) + ); + } + codeqw.groupBy("producer"); + codeqw.orderByDesc("c"); + + return socialDirectoryMapper.selectMaps(codeqw); + + } }