diff --git a/src/main/java/com/syjiaer/clinic/server/common/util/StringUtil.java b/src/main/java/com/syjiaer/clinic/server/common/util/StringUtil.java index d710070..7652263 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/util/StringUtil.java +++ b/src/main/java/com/syjiaer/clinic/server/common/util/StringUtil.java @@ -2,6 +2,8 @@ package com.syjiaer.clinic.server.common.util; import org.springframework.stereotype.Component; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.UUID; @Component @@ -9,4 +11,18 @@ public class StringUtil { public String generateRandomId() { return UUID.randomUUID().toString(); } + + public String getCode(String tag) { + LocalDateTime now = LocalDateTime.now(); + + // 定义日期时间格式 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"); + + // 格式化日期时间为字符串 + String formattedDateTime = now.format(formatter); + + + String code = tag+formattedDateTime; + return code; + } } diff --git a/src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationMember.java b/src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationMember.java index d2d882d..a4da680 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationMember.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationMember.java @@ -3,23 +3,21 @@ package com.syjiaer.clinic.server.entity.organization; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.syjiaer.clinic.server.common.annotations.NotNull; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.time.LocalDateTime; /** *

* 成员表 *

* * @author NiuZiYuan - * @since 2025-04-11 + * @since 2025-04-17 */ @Getter @Setter @@ -36,22 +34,18 @@ public class OrganizationMember implements Serializable { private Integer id; @ApiModelProperty("成员名称") - @NotNull("请输入姓名") private String name; @ApiModelProperty("成员电话") - @NotNull("请输入手机号") private String tel; @ApiModelProperty("医保人员代码") private String socialMemberCode; @ApiModelProperty("0 医生 1 护士 2 ") - @NotNull("请输入角色") private Integer role; @ApiModelProperty("电子签名") - @NotNull("请上传电子签名") private String electronicSignature; @ApiModelProperty("性别") @@ -67,12 +61,10 @@ public class OrganizationMember implements Serializable { private String idCardNumber; @ApiModelProperty("所属科室") - @NotNull("请输入所属科室") private Integer sectionId; @ApiModelProperty("备注") private String memo; - @ApiModelProperty("逻辑删除") - private Integer delFlag; + private Boolean delFlag; } 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 17b4bd7..e0e5a41 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 @@ -10,10 +10,22 @@ import com.syjiaer.clinic.server.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; +import java.util.List; +/** + * 组织成员 + */ @Service public class OrganizationMemberService extends BaseService { @Autowired private OrganizationMemberMapper organizationMemberMapper; + /* + * 获取成员列表 + * @param pageNum 页码 + * @param pageSize 每页数量 + * @param name 姓名 + * @param tel 电话 + */ public Page list(int pageNum, int pageSize, String name, String tel) { QueryWrapper queryWrapper = new QueryWrapper<>(); if (name != null && !name.isEmpty()) { @@ -26,12 +38,47 @@ public class OrganizationMemberService extends BaseService { Page pageResult = pageHelper(pageNum, pageSize, queryWrapper, organizationMemberMapper); return pageResult; } - public Result add() { - OrganizationMember organizationMember = parmsUtil.getObjectWithCheck("data", OrganizationMember.class); + /* + * 保存/修改成员信息 + * @param organizationMember 成员信息 + */ + public void save(OrganizationMember organizationMember) { if(organizationMember ==null){ throw new MessageException("data参数为空"); } - iOrganizationMemberService.add(organizationMember); - return success(); + organizationMember.setCreateDatetime(LocalDateTime.now()); + organizationMemberMapper.insertOrUpdate(organizationMember); + } + /* + * 删除成员信息 + * @param id 成员id + */ + public void delete(int id) { + OrganizationMember organizationMember = organizationMemberMapper.selectById(id); + if(organizationMember ==null){ + throw new MessageException("id不存在"); + } + organizationMember.setDelFlag(true); + organizationMemberMapper.updateById(organizationMember); + } + /* + * 根据id获取成员信息 + * @param id 成员id + */ + public OrganizationMember get(int id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("del_flag", false).eq("id", id); + OrganizationMember organizationMember = organizationMemberMapper.selectOne(queryWrapper); + return organizationMember; + } + /* + * 获取医生列表 + */ + public List doctorList() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("role", 0) + .eq("del_flag", false); + List organizationMembers = organizationMemberMapper.selectList(queryWrapper); + return organizationMembers; } } diff --git a/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationSectionService.java b/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationSectionService.java new file mode 100644 index 0000000..c206ed2 --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationSectionService.java @@ -0,0 +1,86 @@ +package com.syjiaer.clinic.server.service.organization; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.common.vo.Result; +import com.syjiaer.clinic.server.entity.organization.OrganizationSection; +import com.syjiaer.clinic.server.mapper.organization.OrganizationSectionMapper; +import com.syjiaer.clinic.server.service.BaseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.time.LocalDateTime; +import java.util.List; + +/* + * 组织科室 + */ +@Service +public class OrganizationSectionService extends BaseService { + @Autowired + private StringUtil stringUtil; + @Autowired + private OrganizationSectionMapper organizationSectionMapper; + + public Page list(int pageNum, int pageSize, String name, String caty, String resperName, String resperTel) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + if (name != null && !name.isEmpty()) { + queryWrapper.like("name", name); + } + if (caty != null && !caty.isEmpty()) { + queryWrapper.eq("caty", caty); + } + if (resperName != null && !resperName.isEmpty()) { + queryWrapper.like("resper_name", resperName); + } + if (resperTel != null && !resperTel.isEmpty()) { + queryWrapper.eq("resper_tel", resperTel); + } + queryWrapper.eq("del_flag", 0); + Page pageResult = pageHelper(pageNum, pageSize, queryWrapper, organizationSectionMapper); + return pageResult; + } + + public void save(OrganizationSection organizationSection) { + if (organizationSection == null) { + throw new MessageException("organizationSection参数为空"); + } + if (organizationSection.getId() == null) { + organizationSection.setCreateDatetime(LocalDateTime.now()); + //生成编码 + organizationSection.setCode(stringUtil.getCode("S")); + } + organizationSectionMapper.insertOrUpdate(organizationSection); + } + public void delete(int id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("del_flag", 0).eq("id", id); + OrganizationSection organizationSection = organizationSectionMapper.selectOne(queryWrapper); + if(organizationSection == null){ + throw new MessageException("id不存在"); + } + organizationSectionMapper.updateById(organizationSection); + } + public OrganizationSection get(int id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("del_flag", 0).eq("id", id); + OrganizationSection organizationSection = organizationSectionMapper.selectOne(queryWrapper); + return organizationSection; + } + public List allList() { + QueryWrapper organizationSectionQueryWrapper = new QueryWrapper<>(); + organizationSectionQueryWrapper.eq("del_flag", 0); + List organizationSections = organizationSectionMapper.selectList(organizationSectionQueryWrapper); + List list = organizationSections.stream().map(organizationSection -> { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("id", organizationSection.getId()); + jsonObject.put("name", organizationSection.getName()); + return jsonObject; + }).toList(); + return list; + } +} diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryLimitService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryLimitService.java index c325540..f7cbcb4 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryLimitService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryLimitService.java @@ -16,7 +16,9 @@ import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; import java.util.Map; - +/* + * 医保限价 + */ @Service public class SocialDirectoryLimitService { @Autowired diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectorySelfService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectorySelfService.java index a2dbc1c..1fa02ac 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectorySelfService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectorySelfService.java @@ -16,7 +16,9 @@ import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; import java.util.Map; - +/* + * 自付比例 + */ @Service public class SocialDirectorySelfService { @Autowired 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 1e4d8ab..064c45e 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 @@ -27,7 +27,9 @@ import java.time.format.DateTimeFormatter; import java.util.*; import java.util.logging.Logger; import java.util.stream.Collectors; - +/* +* 医保目录 + */ @Service public class SocialDirectoryService extends BaseService { @Autowired diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryUpinfoService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryUpinfoService.java index 24524a5..695e5c7 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryUpinfoService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryUpinfoService.java @@ -17,6 +17,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.logging.Logger; +/* + * 目录有效期 + */ @Service public class SocialDirectoryUpinfoService { @@ -31,7 +34,7 @@ public class SocialDirectoryUpinfoService { * @param updtTime 更新时间 * @param pageNum 页码 */ - public Map getInfo(String updtTime, int pageNum) { + public Map updateSocial(String updtTime, int pageNum) { if (updtTime == null) { throw new MessageException("updtTime不能为空"); } diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryVersionService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryVersionService.java index 027e255..25b3786 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryVersionService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryVersionService.java @@ -10,7 +10,9 @@ import org.springframework.stereotype.Service; import java.util.Arrays; import java.util.List; - +/* +* 目录版本号日志 + */ @Service public class SocialDirectoryVersionService { @Autowired diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialUploadService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java similarity index 58% rename from src/main/java/com/syjiaer/clinic/server/service/social/SocialUploadService.java rename to src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java index 505844f..4d7bd2d 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialUploadService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java @@ -1,7 +1,9 @@ package com.syjiaer.clinic.server.service.social; import org.springframework.stereotype.Service; - +/* + * 医保进销存上报 + */ @Service -public class SocialUploadService { +public class SocialInventoryUploadService { } diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialUserService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialUserService.java index 7b4f6a2..1f03c72 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialUserService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialUserService.java @@ -12,7 +12,9 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - +/* + * 医保用户 + */ @Service public class SocialUserService { @Autowired