From 9ac8ef0eeeba9244f6537e50841066b161af3922 Mon Sep 17 00:00:00 2001 From: LiJianZhao Date: Wed, 30 Apr 2025 10:12:43 +0800 Subject: [PATCH] deb --- .../OrganizationMemberController.java | 10 +++- .../server/entity/charge/dto/ChargeQuery.java | 1 + .../entity/charge/vo/ChargeDetailVo.java | 3 +- .../organization/dto/DockerSearchQuery.java | 10 ++++ .../entity/organization/vo/MemberVo.java | 56 +++++++++++++++++++ .../OrganizationMemberMapper.java | 5 ++ .../server/service/charge/ChargeService.java | 9 ++- .../diagnosis/MedicalRecordService.java | 1 - .../OrganizationMemberService.java | 26 ++++++++- .../service/statistics/StatisticsService.java | 6 +- .../xml/OrganizationMemberMapper.xml | 9 +++ 11 files changed, 123 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/syjiaer/clinic/server/entity/organization/dto/DockerSearchQuery.java create mode 100644 src/main/java/com/syjiaer/clinic/server/entity/organization/vo/MemberVo.java diff --git a/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java b/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java index 96b6f08..fa86d99 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java @@ -4,8 +4,11 @@ import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.common.vo.Result; import com.syjiaer.clinic.server.controller.BaseController; +import com.syjiaer.clinic.server.entity.charge.dto.ChargeQuery; import com.syjiaer.clinic.server.entity.organization.OrganizationMember; +import com.syjiaer.clinic.server.entity.organization.dto.DockerSearchQuery; import com.syjiaer.clinic.server.entity.organization.dto.OrganizationMemberSaveDto; +import com.syjiaer.clinic.server.entity.organization.vo.MemberVo; import com.syjiaer.clinic.server.service.organization.OrganizationMemberService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; @@ -56,8 +59,9 @@ public class OrganizationMemberController extends BaseController { return success(organizationMemberService.get(id)); } - @RequestMapping("/allDoctorList") - public Result> allDoctorList() { - return success(organizationMemberService.doctorList()); + @RequestMapping("/search") + public Result> allDoctorList() { + DockerSearchQuery dockerSearchQuery = parmsUtil.getObject("query", DockerSearchQuery.class); + return success(organizationMemberService.doctorList(dockerSearchQuery)); } } diff --git a/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeQuery.java b/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeQuery.java index d01ec2f..c20a8ca 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeQuery.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeQuery.java @@ -7,5 +7,6 @@ public class ChargeQuery { private String patientName; private Integer pageNum; private Integer pageSize; + private Integer patientId; } diff --git a/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeDetailVo.java b/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeDetailVo.java index 60f0ac6..16739dd 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeDetailVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeDetailVo.java @@ -1,5 +1,6 @@ package com.syjiaer.clinic.server.entity.charge.vo; +import com.syjiaer.clinic.server.entity.charge.ChargeGoodsList; import com.syjiaer.clinic.server.entity.charge.ChargeItemList; import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalRecord; import com.syjiaer.clinic.server.entity.patient.PatientInfo; @@ -60,6 +61,6 @@ public class ChargeDetailVo { @ApiModelProperty("诊疗服务") private List serviceDetail; @ApiModelProperty("药品耗材") - private List goodsDetail; + private List goodsDetail; } diff --git a/src/main/java/com/syjiaer/clinic/server/entity/organization/dto/DockerSearchQuery.java b/src/main/java/com/syjiaer/clinic/server/entity/organization/dto/DockerSearchQuery.java new file mode 100644 index 0000000..3099f11 --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/entity/organization/dto/DockerSearchQuery.java @@ -0,0 +1,10 @@ +package com.syjiaer.clinic.server.entity.organization.dto; + +import lombok.Data; + +@Data +public class DockerSearchQuery { + private String name; + private Integer sectionId; + private Integer role; +} diff --git a/src/main/java/com/syjiaer/clinic/server/entity/organization/vo/MemberVo.java b/src/main/java/com/syjiaer/clinic/server/entity/organization/vo/MemberVo.java new file mode 100644 index 0000000..a4ee1df --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/entity/organization/vo/MemberVo.java @@ -0,0 +1,56 @@ +package com.syjiaer.clinic.server.entity.organization.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; +@Data +public class MemberVo { + @ApiModelProperty("自增主键") + private Integer id; + + @ApiModelProperty("成员电话") + private String tel; + + @ApiModelProperty("医保人员代码") + private String socialMemberCode; + + @ApiModelProperty("电子签名") + private String electronicSignature; + + @ApiModelProperty("性别") + private String gender; + + @ApiModelProperty("年龄") + private String age; + + @ApiModelProperty("创建时间") + private LocalDateTime createDatetime; + + @ApiModelProperty("身份证号") + private String idCardNumber; + + @ApiModelProperty("所属科室") + private Integer sectionId; + + @ApiModelProperty("备注") + private String memo; + + @ApiModelProperty("管理员id") + private Integer managerUserId; + + @ApiModelProperty("成员名") + private String name; + + @ApiModelProperty("角色") + private Integer role; + + @ApiModelProperty("删除标记") + private Boolean delFlag; + + @ApiModelProperty("科室名称") + private String sectionName; + +} diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/organization/OrganizationMemberMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/organization/OrganizationMemberMapper.java index 052ee61..dfac745 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/organization/OrganizationMemberMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/organization/OrganizationMemberMapper.java @@ -2,9 +2,12 @@ package com.syjiaer.clinic.server.mapper.organization; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.syjiaer.clinic.server.entity.organization.OrganizationMember; +import com.syjiaer.clinic.server.entity.organization.vo.MemberVo; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.io.Serializable; +import java.util.List; /** @@ -16,5 +19,7 @@ import java.io.Serializable; * @since 2025-04-11 */ public interface OrganizationMemberMapper extends BaseMapper { + + List selectDetailByIds(@Param("ids") List ids); } diff --git a/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java b/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java index aca9800..a1d65cc 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java @@ -247,6 +247,7 @@ public class ChargeService extends BaseService { chargeOrder.setStatus(RetailOrderStatusEnum.UNFINISHED.getCode()); chargeOrder.setPatientId(dto.getPatientInfo().getId()); chargeOrder.setDiagnosisCode(dto.getDiagnosisMedicalRecord().getDiagnosisCode()); + chargeOrder.setSalePersonId(dto.getPatientRegistration().getOrganizationDoctorId()); chargeOrderMapper.insert(chargeOrder); return chargeOrder; @@ -264,16 +265,18 @@ public class ChargeService extends BaseService { if (query.getPatientName() != null) { queryWrapper.like("patient_name", query.getPatientName()); } + if (query.getPatientId() != null){ + queryWrapper.eq("patient_id", query.getPatientId()); + } Page orderPage = pageHelper(query.getPageNum(), query.getPageSize(), queryWrapper, chargeOrderMapper, "create_datetime", false); List voList = new ArrayList<>(); for (ChargeOrder chargeOrder : orderPage.getList()) { ChargeDetailVo detailVo = new ChargeDetailVo(); BeanUtils.copyProperties(chargeOrder, detailVo); detailVo.setPatientInfo(patientInfoMapper.selectById(chargeOrder.getPatientId())); - detailVo.setServiceDetail(chargeItemListMapper.selectList(new QueryWrapper() - .eq("charge_order_code", chargeOrder.getCode()))); + detailVo.setServiceDetail(chargeItemListMapper.selectByCode(chargeOrder.getCode())); - detailVo.setGoodsDetail(chargeGoodsListMapper.selectDetailByCode(chargeOrder.getCode())); + detailVo.setGoodsDetail(chargeGoodsListMapper.selectByCode(chargeOrder.getCode())); voList.add(detailVo); } Page resultPage = new Page<>(); 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 7d516df..6dcc33c 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 @@ -10,7 +10,6 @@ import com.syjiaer.clinic.server.common.enums.RegistrationStatusEnum; import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.common.util.StringUtil; import com.syjiaer.clinic.server.common.vo.Page; -import com.syjiaer.clinic.server.entity.charge.vo.ChargeDetailVo; import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo; import com.syjiaer.clinic.server.entity.charge.vo.ChargeItemListVo; import com.syjiaer.clinic.server.entity.diagnosis.Diagnosis; diff --git a/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java b/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java index 5c35568..6995359 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java @@ -2,12 +2,16 @@ package com.syjiaer.clinic.server.service.organization; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.syjiaer.clinic.server.common.api.annotations.IMField; import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.common.util.FileUtil; import com.syjiaer.clinic.server.common.vo.Page; +import com.syjiaer.clinic.server.entity.charge.dto.ChargeQuery; import com.syjiaer.clinic.server.entity.manager.ManagerUser; import com.syjiaer.clinic.server.entity.organization.OrganizationMember; +import com.syjiaer.clinic.server.entity.organization.dto.DockerSearchQuery; import com.syjiaer.clinic.server.entity.organization.dto.OrganizationMemberSaveDto; +import com.syjiaer.clinic.server.entity.organization.vo.MemberVo; import com.syjiaer.clinic.server.mapper.manager.ManagerUserMapper; import com.syjiaer.clinic.server.mapper.organization.OrganizationMemberMapper; import com.syjiaer.clinic.server.service.BaseService; @@ -145,9 +149,25 @@ public class OrganizationMemberService extends BaseService { /* * 获取医生列表 */ - public List doctorList() { + public List doctorList(DockerSearchQuery dockerSearchQuery) { + if (dockerSearchQuery == null){ + return new ArrayList<>(); + } QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("role", 1); - return organizationMemberMapper.selectList(queryWrapper); + + queryWrapper.select("id"); + if (dockerSearchQuery.getName() != null){ + queryWrapper.like("name", dockerSearchQuery.getName()); + } + if (dockerSearchQuery.getSectionId() != null){ + queryWrapper.eq("section_id", dockerSearchQuery.getSectionId()); + } + if (dockerSearchQuery.getRole() != null){ + queryWrapper.eq("role", dockerSearchQuery.getRole()); + } + + List ids = organizationMemberMapper.selectObjs(queryWrapper); + + return organizationMemberMapper.selectDetailByIds(ids); } } diff --git a/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java b/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java index 27e487c..071808d 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java @@ -150,8 +150,10 @@ public class StatisticsService extends BaseService { Integer salePersonId = (Integer) map.get("sale_person_id"); SalePersonReportVo vo = voMaps.getOrDefault(salePersonId, new SalePersonReportVo()); vo.setSalePersonId(salePersonId); - OrganizationMember organizationMember = organizationMemberMapper.selectById(salePersonId); - vo.setSalePersonName(organizationMember.getName()); + if (salePersonId != null){ + OrganizationMember organizationMember = organizationMemberMapper.selectById(salePersonId); + vo.setSalePersonName(organizationMember.getName()); + } vo.setTotalIncome(vo.getTotalIncome().add((BigDecimal) map.get("sum"))); vo.setCount(vo.getCount()+(Long) map.get("count")); RetailOrderPayTypeEnum payType = RetailOrderPayTypeEnum.getByCode((Integer) map.get("pay_type")); diff --git a/src/main/resources/xml/OrganizationMemberMapper.xml b/src/main/resources/xml/OrganizationMemberMapper.xml index 4d96655..f1dbb52 100644 --- a/src/main/resources/xml/OrganizationMemberMapper.xml +++ b/src/main/resources/xml/OrganizationMemberMapper.xml @@ -2,4 +2,13 @@ +