diff --git a/doctor-auth/src/main/resources/bootstrap.yml b/doctor-auth/src/main/resources/bootstrap.yml index c30cba2..7f241e4 100644 --- a/doctor-auth/src/main/resources/bootstrap.yml +++ b/doctor-auth/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-gateway/src/main/resources/bootstrap.yml b/doctor-gateway/src/main/resources/bootstrap.yml index cc0e562..e0b9071 100644 --- a/doctor-gateway/src/main/resources/bootstrap.yml +++ b/doctor-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-file/src/main/resources/bootstrap.yml b/doctor-modules/doctor-file/src/main/resources/bootstrap.yml index c992149..400e098 100644 --- a/doctor-modules/doctor-file/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-file/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml b/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml index 007713f..9b8484d 100644 --- a/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java index b12af44..2c8cc99 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java @@ -4,6 +4,7 @@ package doctor.controller; import doctor.common.core.domain.HealthR; import doctor.common.core.domain.R; import doctor.domain.entity.*; +import doctor.service.DiseaseCategoryService; import doctor.service.DiseaseKnowledgeService; import doctor.service.HealthJobTitleService; import org.springframework.beans.factory.annotation.Autowired; @@ -27,6 +28,8 @@ import static doctor.common.core.utils.PageUtils.startPage; public class DiseaseKnowledgeController { @Autowired private DiseaseKnowledgeService diseaseKnowledgeService; + @Autowired + private DiseaseCategoryService diseaseCategoryService; @GetMapping("/findDepartment") public HealthR> findDepartment(){ @@ -63,6 +66,12 @@ public class DiseaseKnowledgeController { List list=diseaseKnowledgeService.popularSeach(); return HealthR.ok(list); } + @GetMapping("/findDiseaseCategory") + public HealthR> findDiseaseCategory(@RequestParam Integer departmentId){ + List list=diseaseCategoryService.findDiseaseCategory(departmentId); + return HealthR.ok(list); + } + diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/DoctorController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/DoctorController.java index a93d06b..a7a0ced 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/DoctorController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/DoctorController.java @@ -2,6 +2,7 @@ package doctor.controller; import doctor.common.core.domain.HealthR; import doctor.domain.entity.DoctorEntity; +import doctor.domain.vo.DoctorVo; import doctor.service.DoctorService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -12,6 +13,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.print.Doc; import java.util.List; +import static com.github.pagehelper.page.PageMethod.startPage; + /** * @BelongsProject: Medical_Treatment * @BelongsPackage: doctor.controller @@ -24,13 +27,14 @@ public class DoctorController { @Autowired private DoctorService doctorService; @GetMapping("/findDoctorList") - public HealthR> findDoctorList(@RequestParam Integer deptId, - @RequestParam Integer condition, - @RequestParam Integer sortBy, - @RequestParam(value = "page",defaultValue = "1") Integer page, - @RequestParam(value = "count",defaultValue = "5") Integer count + public HealthR> findDoctorList(@RequestParam Integer deptId, + @RequestParam Integer condition, + @RequestParam Integer sortBy, + @RequestParam(value = "page",defaultValue = "1") Integer page, + @RequestParam(value = "count",defaultValue = "5") Integer count ){ - List list=doctorService.findDoctorList(deptId); + startPage(page,count); + List list=doctorService.findDoctorList(deptId,condition,sortBy); return HealthR.ok(list); } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/InquiryController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/InquiryController.java index 69dc8d8..876acd6 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/InquiryController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/InquiryController.java @@ -34,7 +34,7 @@ public class InquiryController { @GetMapping("/v1/findDoctorInfo") public HealthR findDoctorInfo(@RequestHeader Integer userId, @RequestHeader String sessionId, - @RequestParam Integer doctorId) { + @RequestParam(value = "doctorId",defaultValue = "2") Integer doctorId) { DoctorVo doctorVo = inquiryService.findDoctorInfo(doctorId); return HealthR.ok(doctorVo); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/convert/DoctorConvert.java b/doctor-modules/doctor-health/src/main/java/doctor/convert/DoctorConvert.java new file mode 100644 index 0000000..2d4643d --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/convert/DoctorConvert.java @@ -0,0 +1,25 @@ +package doctor.convert; + +import doctor.domain.entity.DoctorEntity; +import doctor.domain.vo.DoctorVo; +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +@Mapper +public interface DoctorConvert { + + DoctorConvert INSTANCE = Mappers.getMapper(DoctorConvert.class); + + DoctorEntity doctorVoToDoctorEntity(DoctorVo doctorVo); + @Mappings({ + @Mapping(source = "id", target = "doctorId") + }) + DoctorVo doctorEntityToDoctorVo(DoctorEntity doctorEntity); + List doctorEntityListToDoctorVoList(List doctorEntityList); + + List doctorVoListToDoctorEntityList(List doctorVoList); +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorAskCount.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorAskCount.java new file mode 100644 index 0000000..bf71f5a --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorAskCount.java @@ -0,0 +1,24 @@ +package doctor.domain.entity; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.domain.entity + * @Author: jpz + * @CreateTime: 2024/1/19 11:41 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DoctorAskCount { + private Integer id; + private Integer doctorAskCount; + private Integer number; + private Date updateTime; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorCharge.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorCharge.java new file mode 100644 index 0000000..9f0a0ba --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorCharge.java @@ -0,0 +1,24 @@ +package doctor.domain.entity; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.domain.entity + * @Author: jpz + * @CreateTime: 2024/1/18 18:33 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DoctorCharge { + private Integer id; + private Integer doctorId; + private Integer cost; + private Date updateTime; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorCommentCount.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorCommentCount.java new file mode 100644 index 0000000..83e341f --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorCommentCount.java @@ -0,0 +1,24 @@ +package doctor.domain.entity; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.domain.entity + * @Author: jpz + * @CreateTime: 2024/1/18 18:48 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DoctorCommentCount { + private Integer id; + private Integer doctorId; + private Integer praiseNum; + private Integer badNum; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorEntity.java index 331dd38..816bb14 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorEntity.java @@ -24,6 +24,7 @@ public class DoctorEntity { private String phone; private String pwd; private String name; + private String jobTitle; private String imagePic; private String inauguralHospital; private String personalProfile; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserDoctorFollowEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserDoctorFollowEntity.java index 23ccfa5..89db021 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserDoctorFollowEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserDoctorFollowEntity.java @@ -1,6 +1,8 @@ package doctor.domain.entity; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.Date; @@ -10,42 +12,16 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/8 21:49 */ - +@Data +@AllArgsConstructor +@NoArgsConstructor public class UserDoctorFollowEntity { private Integer id; - private Integer userId; + private Long userId; private Integer doctorId; private Date createTime; - public Integer getId() { - return id; - } - public void setId(Integer id) { - this.id = id; - } - public Integer getUserId() { - return userId; - } - public void setUserId(Integer userId) { - this.userId = userId; - } - - public Integer getDoctorId() { - return doctorId; - } - - public void setDoctorId(Integer doctorId) { - this.doctorId = doctorId; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorVo.java index 0f1f4d9..2534241 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorVo.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorVo.java @@ -24,12 +24,7 @@ public class DoctorVo { private double praise; private Integer serverNum; private Integer servicePrice; - private Integer followFlag; - private String personalProfile; - private String goodField; - private Integer commentNum; private Integer praiseNum; private Integer badNum; - private List doctorReceiveGiftList; - private List commentVoList; + private Integer commentNum; } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/DoctorMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/DoctorMapper.java index 1836f85..baae786 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/DoctorMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/DoctorMapper.java @@ -1,6 +1,7 @@ package doctor.mapper; import doctor.domain.entity.DoctorEntity; +import org.apache.ibatis.annotations.Param; import org.mybatis.spring.annotation.MapperScan; import java.util.List; @@ -13,5 +14,6 @@ import java.util.List; */ @MapperScan public interface DoctorMapper { - List findDoctorList(Integer deptId); +// List findDoctorList(Integer deptId, Integer condition, Integer sortBy); + List findDoctorList(@Param("deptId") Integer deptId); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryMapper.java index 05b979d..fe85ae8 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryMapper.java @@ -1,6 +1,10 @@ package doctor.mapper; +import doctor.domain.entity.DoctorAskCount; import doctor.domain.entity.InquiryDetailsRecordEntity; +import doctor.domain.entity.InquiryRecordEntity; +import doctor.domain.entity.UserDoctorFollowEntity; +import doctor.domain.vo.DoctorVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -19,4 +23,20 @@ public interface InquiryMapper { void consultDoctor(@Param("userId") Integer userId, @Param("doctorId") Integer doctorId); String findDoctorUserNameByDoctorId(@Param("doctorId") Integer doctorId); + + DoctorVo findDoctorInfo(@Param("doctorId") Integer doctorId); + + void followDoctor(@Param("userDoctorFollowEntity") UserDoctorFollowEntity userDoctorFollowEntity); + + void delCancelFollow(@Param("userid") Long userid, @Param("doctorId") Integer doctorId); + + InquiryRecordEntity findInquiryRecordById(@Param("recordId") Integer recordId, int i); + + void endInquiry(@Param("recordId") Integer recordId); + + DoctorAskCount getDoctorAskCount(@Param("doctorId") Integer doctorId); + + void addDoctorAskCount(DoctorAskCount doctorAskCount); + + void updDoctorAskCount(DoctorAskCount doctorAskCount); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/DoctorService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/DoctorService.java index 8c65c46..9ff185e 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/DoctorService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/DoctorService.java @@ -1,6 +1,7 @@ package doctor.service; import doctor.domain.entity.DoctorEntity; +import doctor.domain.vo.DoctorVo; import java.util.List; @@ -11,5 +12,5 @@ import java.util.List; * @CreateTime: 2024/1/15 11:32 */ public interface DoctorService { - List findDoctorList(Integer deptId); + List findDoctorList(Integer deptId, Integer condition, Integer sortBy); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DoctorServiceimpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DoctorServiceimpl.java index cd5181f..c188bd8 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DoctorServiceimpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DoctorServiceimpl.java @@ -1,11 +1,17 @@ package doctor.service.impl; +import doctor.convert.DoctorConvert; +import doctor.domain.entity.DoctorCharge; +import doctor.domain.entity.DoctorCommentCount; import doctor.domain.entity.DoctorEntity; +import doctor.domain.vo.DoctorVo; import doctor.mapper.DoctorMapper; import doctor.service.DoctorService; +import doctor.system.api.domain.Doctor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -19,8 +25,33 @@ public class DoctorServiceimpl implements DoctorService { @Autowired private DoctorMapper doctorMapper; + @Override - public List findDoctorList(Integer deptId) { - return doctorMapper.findDoctorList(deptId); + public List findDoctorList(Integer deptId, Integer condition, Integer sortBy) { + List doctorEntities=doctorMapper.findDoctorList(deptId);//获取指定部门的医生实体列表 +// List doctorVos=new ArrayList<>(); +// for (DoctorEntity doctorEntity : doctorVoList) { +// DoctorVo doctorVo = new DoctorVo(); +// DoctorCharge doctorCharge = doctorMapper.doctorCharge(doctorEntity.getId()); // 获医生的收费信 +// doctorVo.setServicePrice(doctorCharge.getCost()); // 设置医生的收费价格 +// doctorVo.setDoctorId(doctorEntity.getId()); +// doctorVo.setDoctorName(doctorEntity.getName()); +// doctorVo.setDoctorName(doctorVo.getDoctorName()); +// doctorVo.setImagePic(doctorVo.getImagePic()); +// doctorVo.setJobTitle(doctorEntity.getJobTitle()); +// doctorVo.setInauguralHospital(doctorVo.getInauguralHospital()); +// DoctorCommentCount doctored=doctorMapper.doctorCommentCount(doctorEntity.getId()); +// doctorVo.setPraiseNum(doctored.getPraiseNum()); +// doctorVo.setCommentNum(doctored.getPraiseNum()+doctored.getBadNum()); +// doctorVo.setBadNum(doctored.getBadNum()); +// doctorVo.setPraise(doctorVo.getPraiseNum()/doctorVo.getCommentNum()); +// +// +// +// } + + List doctorVos= DoctorConvert.INSTANCE.doctorEntityListToDoctorVoList(doctorEntities); + + return doctorVos; } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryServiceImpl.java index e206164..960fa70 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryServiceImpl.java @@ -1,16 +1,21 @@ package doctor.service.impl; -import doctor.domain.entity.InquiryDetailsRecordEntity; +import doctor.common.security.utils.SecurityUtils; +import doctor.domain.entity.*; import doctor.domain.vo.DoctorVo; import doctor.domain.vo.InquiryDetailsRecordVo; import doctor.mapper.InquiryMapper; import doctor.service.InquiryService; +import doctor.system.api.domain.Doctor; +import doctor.system.api.model.LoginUser; import doctor.util.ConvertUtil; import doctor.util.RSAUtils; import doctor.util.RsaKey; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.sql.Timestamp; +import java.util.Date; import java.util.List; /** @@ -32,17 +37,22 @@ public class InquiryServiceImpl implements InquiryService { @Override public DoctorVo findDoctorInfo(Integer doctorId) { +// DoctorCharge doctorCharge=inquiryMapper.doctorCharge(doctorId); +// DoctorCommentCount doctorCommentCount=inquiryMapper.doctorCommentCount(doctorId); + return inquiryMapper.findDoctorInfo(doctorId); + - return null; } @Override public String consultDoctor(Integer userId, Integer doctorId) { inquiryMapper.consultDoctor(userId,doctorId); - String doctorUserName = inquiryMapper.findDoctorUserNameByDoctorId(doctorId); + String doctorUserName1 = inquiryMapper.findDoctorUserNameByDoctorId(doctorId); try { - String s = RSAUtils.rsaDecrypt(doctorUserName, RsaKey.PUBLIC_KEY); - return s; + List strings = RSAUtils.rsaEncrypt(doctorUserName1, RsaKey.PUBLIC_KEY); + String doctorUserName = strings.get(0); + System.out.println("==============="+doctorUserName); + return doctorUserName; } catch (Exception e) { throw new RuntimeException(e); } @@ -50,16 +60,61 @@ public class InquiryServiceImpl implements InquiryService { @Override public void followDoctor(Integer userId, Integer doctorId) { + if (doctorId==0){ + throw new RuntimeException("医生Id不能为空"); + }else { + UserDoctorFollowEntity userDoctorFollowEntity = new UserDoctorFollowEntity(); + LoginUser loginUser= SecurityUtils.getLoginUser(); + Long userid = loginUser.getUserid(); + userDoctorFollowEntity.setUserId(userid); + userDoctorFollowEntity.setDoctorId(doctorId); + userDoctorFollowEntity.setCreateTime(new Date()); + inquiryMapper.followDoctor(userDoctorFollowEntity); + } } + //取消关注 @Override public void cancelFollow(Integer userId, Integer doctorId) { - + LoginUser loginUser= SecurityUtils.getLoginUser(); + Long userid=loginUser.getUserid(); + inquiryMapper.delCancelFollow(userid,doctorId); } + //结束问增 @Override public void endInquiry(Integer userId, Integer recordId) { + //检查问诊记录Id是否为空 + if (recordId == 0) { + throw new RuntimeException("问诊记录Id不能为空"); + } + //结束问诊,获取问诊记录信息 + InquiryRecordEntity inquiryRecordEntity = inquiryMapper.findInquiryRecordById(recordId,1); + //结束问诊,修改问诊记录状态 + inquiryMapper.endInquiry(recordId); + if (inquiryRecordEntity==null){ + throw new RuntimeException("没有找到该问诊记录"); + } + //获取医生问诊次数信息 + DoctorAskCount doctorAskCount=inquiryMapper.getDoctorAskCount(inquiryRecordEntity.getDoctorId()); + // 如果医生问诊次数信息为空，表示医生首次问诊，添加新的记录 + if (doctorAskCount==null){ + doctorAskCount = new DoctorAskCount(); + doctorAskCount.setDoctorAskCount(inquiryRecordEntity.getDoctorId()); + doctorAskCount.setNumber(1); + doctorAskCount.setUpdateTime(new Date()); + doctorAskCount.setCreateTime(new Timestamp(new Date().getTime())); + // 添加医生问诊次数记录到数据库 + inquiryMapper.addDoctorAskCount(doctorAskCount); + } + else { + // 如果医生已有问诊次数记录，增加次数并更新信息 + doctorAskCount.setNumber(doctorAskCount.getNumber() + 1); + doctorAskCount.setUpdateTime(new Date()); + // 更新医生问诊次数记录到数据库 + inquiryMapper.updDoctorAskCount(doctorAskCount); + } } } diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DoctorMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DoctorMapper.xml index 6413b10..453b6f1 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DoctorMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DoctorMapper.xml @@ -5,8 +5,14 @@ + + + + + + + diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryMapper.xml index c16948d..4b57f80 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryMapper.xml @@ -20,6 +20,25 @@ now() ) + + insert into user_doctor_follow (doctor_id, user_id, create_time)values (#{doctorId}, #{userId}, #{createTime}) + + + insert into doctor_ask_count (doctor_id, number, create_time) + values (#{doctorId}, #{number}, #{createTime}) + + + update inquiry_record set status = 2 where id = #{recordId} + + + update doctor_ask_count + set number = #{number}, + update_time = #{updateTime} + where doctor_id = #{doctorId} + + + delete from user_doctor_follow where doctor_id = #{doctorId} and user_id = #{userId} + + + + diff --git a/doctor-modules/doctor-job/src/main/resources/bootstrap.yml b/doctor-modules/doctor-job/src/main/resources/bootstrap.yml index 537c5d6..687623f 100644 --- a/doctor-modules/doctor-job/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-job/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-system/src/main/resources/bootstrap.yml b/doctor-modules/doctor-system/src/main/resources/bootstrap.yml index 8def34f..632b0bd 100644 --- a/doctor-modules/doctor-system/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-system/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml b/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml index 979155f..f378a98 100644 --- a/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml +++ b/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 # 配置文件格式 file-extension: yml # 共享配置