Merge remote-tracking branch 'origin/cbx' into newMaster

This reverts commit f0c7d44551.

doctor-common/doctor-common-core/pom.xml

@@ -121,6 +121,13 @@
         </dependency>
 
 
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <version>2.2</version>
+        </dependency>
+
+
 
 
     </dependencies>

doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/TokenConstants.java

@@ -11,7 +11,7 @@ public class TokenConstants
      * 令牌自定义标识
      */
     public static final String AUTHENTICATION = "Authorization";
-    public static final String SESSIONID = "SESSIONID";
+    public static final String SESSIONID = "Sessionid";
 
     /**
      * 令牌前缀

doctor-common/doctor-common-core/src/main/java/doctor/common/core/web/controller/BaseController.java

@@ -48,6 +48,13 @@ public class BaseController
         PageUtils.startPage();
     }
 
+    protected void startPage(Integer page,Integer count)
+    {
+        PageUtils.startPage(page,count);
+    }
+
+
+
     /**
      * 清理分页的线程变量
      */

doctor-gateway/src/main/java/doctor/gateway/filter/AuthFilter.java

@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.core.Ordered;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.stereotype.Component;
 import org.springframework.web.server.ServerWebExchange;
@@ -52,6 +53,7 @@ public class AuthFilter implements GlobalFilter, Ordered
         {
             return chain.filter(exchange);
         }
+
         String token = getToken(request);
 
         if (StringUtils.isEmpty(token))
@@ -121,14 +123,11 @@ public class AuthFilter implements GlobalFilter, Ordered
     private String getToken(ServerHttpRequest request)
     {
         String token = request.getHeaders().getFirst(TokenConstants.AUTHENTICATION);
-        if (StringUtils.isNotEmpty(token))
+        if (StringUtils.isEmpty(token))
         {
-            token = request.getQueryParams().getFirst(TokenConstants.SESSIONID);
+            token = request.getHeaders().getFirst(TokenConstants.SESSIONID);
         }
-        if(StringUtils.isNotEmpty(token)){
-            request.getHeaders().set(TokenConstants.SESSIONID,token);
-        }
-        // 如果前端设置了令牌前缀，则裁剪掉前缀
+        // 如果前端设置了令牌前缀，则裁剪掉前缀``
         if (StringUtils.isNotEmpty(token) && token.startsWith(TokenConstants.PREFIX))
         {
             token = token.replaceFirst(TokenConstants.PREFIX, StringUtils.EMPTY);

doctor-modules/doctor-health/src/main/java/doctor/controller/HealthInquiryVerifyController.java

@@ -0,0 +1,26 @@
+package doctor.controller;
+
+import doctor.common.core.domain.HealthR;
+import doctor.domain.vo.InquiryRecordVo;
+import doctor.service.InquiryVerifyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/inquiry/verify/v1")
+public class HealthInquiryVerifyController {
+
+    @Autowired
+    private InquiryVerifyService inquiryVerifyService;
+
+    @GetMapping("/findInquiryRecordList")
+    public HealthR<List<InquiryRecordVo>> findInquiryRecordList() {
+        List<InquiryRecordVo> inquiryRecordList = inquiryVerifyService.findInquiryRecordList();
+        return HealthR.ok(inquiryRecordList);
+    }
+
+}

doctor-modules/doctor-health/src/main/java/doctor/controller/HealthJobTitleController.java

@@ -1,13 +1,16 @@
 package doctor.controller;
 
 import doctor.common.core.domain.HealthR;
+import doctor.common.core.web.controller.BaseController;
+import doctor.common.security.utils.SecurityUtils;
 import doctor.domain.dto.ApplyJoinDto;
+import doctor.domain.dto.CheckCodeDto;
 import doctor.domain.entity.Banners;
 import doctor.domain.entity.DoctorJobTitleEntity;
-import doctor.domain.vo.DoctorVo;
-import doctor.domain.vo.FindImagePicVo;
+import doctor.domain.vo.*;
 import doctor.service.BannersService;
 import doctor.service.HealthJobTitleService;
+import doctor.system.api.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -22,45 +25,63 @@ public class HealthJobTitleController {
 
     @Autowired
     private BannersService bannersService;
+
+
+    @GetMapping("/findHistoryInquiryRecord")
+    public HealthR<List<DoctorHistoryInquiryVo>> findHistoryInquiryRecord(@RequestHeader Integer doctorId,
+                                                                          @RequestHeader String sessionId,
+                                                                          @RequestParam Integer page,
+                                                                          @RequestParam Integer size) {
+        HealthR<List<DoctorHistoryInquiryVo>> healthR = healthJobTitleService.findHistoryInquiryRecord(page, size);
+        return null;
+    }
+
+
+    @PostMapping("/drawCash")
+    public HealthR drawCash(@RequestHeader Integer doctorId,
+                            @RequestHeader String sessionId,
+                            @RequestParam Integer money) {
+        HealthR healthR = healthJobTitleService.drawCash(doctorId, money);
+        return healthR;
+    }
+
+
+
     @GetMapping("/bannersShow")
-    public HealthR<List<Banners>> bannersShow(){
+    public HealthR<List<Banners>> bannersShow() {
         List<Banners> banners = bannersService.bannersShow();
         return HealthR.ok(banners);
     }
 
     @GetMapping("/findJobTitleList")
     public HealthR<List<DoctorJobTitleEntity>> findJobTitleList() {
-        List<DoctorJobTitleEntity> doctorJobTitleEntities=healthJobTitleService.findJobTitleList();
+        List<DoctorJobTitleEntity> doctorJobTitleEntities = healthJobTitleService.findJobTitleList();
         return HealthR.ok(doctorJobTitleEntities);
     }
 
-    @PostMapping("/sendEmailCode")
+    @RequestMapping("/sendEmailCode")
     public HealthR sendEmailCode(@RequestParam("email") String email) {
-        HealthR healthR= healthJobTitleService.sendEmailCode(email);
+        HealthR healthR = healthJobTitleService.sendEmailCode(email);
         return HealthR.ok(healthR);
     }
 
     @PostMapping("/applyJoin")
     public HealthR applyJoin(@RequestBody ApplyJoinDto applyJoinDto) {
-        HealthR healthR= healthJobTitleService.applyJoin(applyJoinDto);
+        HealthR healthR = healthJobTitleService.applyJoin(applyJoinDto);
         return HealthR.ok(healthR);
     }
 
-    @GetMapping("/findDoctorById")
-    public HealthR<DoctorVo> findDoctorById(@RequestHeader Integer doctorId,
-                                            @RequestHeader String sessionId) {
-        return HealthR.ok(healthJobTitleService.findDoctorById(doctorId));
+    @PostMapping("/checkCode")
+    public HealthR checkCode(@RequestBody CheckCodeDto checkCodeDto) {
+        String email = checkCodeDto.getEmail();
+        String code = checkCodeDto.getCode();
+        HealthR healthR = healthJobTitleService.checkCode(email, code);
+        return healthR;
     }
+
     @GetMapping("/findSystemImagePic")
     public HealthR<List<FindImagePicVo>> findSystemImagePic() {
         return HealthR.ok(healthJobTitleService.findSystemImagePic());
     }
 
-    @PostMapping("/uploadImagePic")
-    public HealthR uploadImagePic(@RequestParam("imagePic") MultipartFile imagePic,
-                                  @RequestHeader String sessionId,
-                                  @RequestHeader Integer doctorId) {
-        return HealthR.ok(healthJobTitleService.uploadImagePic(imagePic,doctorId,sessionId));
-    }
-
 }

doctor-modules/doctor-health/src/main/java/doctor/controller/HealthSickController.java

@@ -0,0 +1,28 @@
+package doctor.controller;
+
+import doctor.common.core.domain.HealthR;
+import doctor.domain.vo.SickCircleVo;
+import doctor.service.SickCircleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/sickCircle/v1")
+public class HealthSickController {
+
+    @Autowired
+    private SickCircleService sickCircleService;
+
+    @GetMapping("/findSickCircleList")
+    public HealthR<List<SickCircleVo>> sickCircleList(@RequestParam Integer page,
+                                                      @RequestParam Integer count,
+                                                      @RequestParam Integer departmentId) {
+        List<SickCircleVo> sickCircleList = sickCircleService.findSickCircleList(page, count, departmentId);
+        return HealthR.ok(sickCircleList);
+    }
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/dto/CheckCodeDto.java

@@ -0,0 +1,9 @@
+package doctor.domain.dto;
+
+import lombok.Data;
+
+@Data
+public class CheckCodeDto {
+    private String email;
+    private String code;
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorIncomeRecordEntity.java

@@ -0,0 +1,86 @@
+package doctor.domain.entity;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Entity
+@Table(name = "doctor_income_record")
+public class DoctorIncomeRecordEntity {
+    @Id
+    @Column(name = "id")
+    private Integer id;
+
+    @Column(name = "doctor_id")
+    private Integer doctorId;
+
+    @Column(name = "money")
+    private Integer money;
+
+    @Column(name = "direction")
+    private Integer direction;
+
+    @Column(name = "income_type")
+    private Integer incomeType;
+
+    @Column(name = "record_time")
+    private Date recordTime;
+
+    @Column(name = "create_time")
+    private Date createTime;
+
+    public Integer getId() {
+        return this.id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getDoctorId() {
+        return this.doctorId;
+    }
+
+    public void setDoctorId(Integer doctorId) {
+        this.doctorId = doctorId;
+    }
+
+    public Integer getMoney() {
+        return this.money;
+    }
+
+    public void setMoney(Integer money) {
+        this.money = money;
+    }
+
+    public Integer getDirection() {
+        return this.direction;
+    }
+
+    public void setDirection(Integer direction) {
+        this.direction = direction;
+    }
+
+    public Integer getIncomeType() {
+        return this.incomeType;
+    }
+
+    public void setIncomeType(Integer incomeType) {
+        this.incomeType = incomeType;
+    }
+
+    public Date getRecordTime() {
+        return this.recordTime;
+    }
+
+    public void setRecordTime(Date recordTime) {
+        this.recordTime = recordTime;
+    }
+
+    public Date getCreateTime() {
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorWalletEntity.java

@@ -0,0 +1,21 @@
+package doctor.domain.entity;
+
+
+import lombok.Data;
+
+import java.util.Date;
+@Data
+public class DoctorWalletEntity {
+    private Integer id;
+
+    private Integer doctorId;
+
+    private Integer balance;
+
+    private Integer version;
+
+    private Date updateTime;
+
+    private Date createTime;
+
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleEntity.java

@@ -0,0 +1,49 @@
+package doctor.domain.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+public class SickCircleEntity {
+    private Integer id;
+
+    private Integer userId;
+
+    private String title;
+
+    private Integer departmentId;
+
+    private Integer adoptCommentId;
+
+    private String disease;
+
+
+    private String detail;
+
+    private String treatmentHospital;
+
+    private Date treatmentStartTime;
+
+    private Date treatmentEndTime;
+
+    private String treatmentProcess;
+
+    private String picture;
+
+    private Date releaseTime;
+
+    private Date adoptTime;
+
+    private Integer amount;
+
+    private LocalDateTime createTime;
+
+    private Integer collectionNum;
+
+    private Integer commentNum;
+
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/doctorSystemNoticeEntity.java

@@ -0,0 +1,17 @@
+package doctor.domain.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class doctorSystemNoticeEntity {
+    private Integer id;
+    private Integer num;
+    private String content;
+    private Integer noticeType;
+    private Integer pushType;
+    private Integer status;
+    private Date createTime;
+
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorHistoryInquiryVo.java

@@ -0,0 +1,4 @@
+package doctor.domain.vo;
+
+public class DoctorHistoryInquiryVo {
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorIncomeRecordVo.java

@@ -0,0 +1,13 @@
+package doctor.domain.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DoctorIncomeRecordVo {
+    private Integer money;
+    private Integer direction;
+    private Integer incomeType;
+    private Date recordTime;
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/vo/InquiryRecordVo.java

@@ -0,0 +1,15 @@
+package doctor.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class InquiryRecordVo {
+    private Integer recordId;
+    private Integer userId;
+    private String uerHeadPic;
+    private String doctorHeadPic;
+    private String listContent;
+    private String nickName;
+    private long inquiryTime;
+    private Integer status;
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/vo/NoticeReadNumVo.java

@@ -0,0 +1,9 @@
+package doctor.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class NoticeReadNumVo {
+    private int notReadNum;
+    private int noticeType;
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleVo.java

@@ -0,0 +1,12 @@
+package doctor.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class SickCircleVo {
+    private Integer sickCircleId;
+    private String title;
+    private String detail;
+    private long releaseTime;
+    private Integer amount;
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/vo/WalletVo.java

@@ -0,0 +1,14 @@
+package doctor.domain.vo;
+
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+@Data
+public class WalletVo {
+    private Integer id;
+    private Integer doctorId;
+    private Integer balance;
+    private Integer version;
+    private Integer whetherBindIdCard;
+    private Integer whetherBindBankCard;
+}

doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthJobTitleMapper.java

@@ -1,6 +1,9 @@
 package doctor.mapper;
 
+import doctor.domain.entity.DoctorIncomeRecordEntity;
 import doctor.domain.entity.DoctorJobTitleEntity;
+import doctor.domain.entity.DoctorWalletEntity;
+import doctor.domain.entity.doctorSystemNoticeEntity;
 import doctor.system.api.domain.Department;
 import doctor.system.api.domain.Doctor;
 import org.apache.ibatis.annotations.Mapper;
@@ -23,4 +26,10 @@ public interface HealthJobTitleMapper {
     List<String> findDoctorImgPic();
 
     void updDoctorImgPicBuyId(@Param("doctorId") Integer doctorId, @Param("s") String s);
+
+    DoctorWalletEntity findDoctorWalletById(Integer doctorId);
+
+    List<DoctorIncomeRecordEntity> findDoctorIncomeRecordList(Integer doctorId);
+
+    List<doctorSystemNoticeEntity> findDoctorNoticeReadNum(Integer doctorId);
 }

doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryVerifyServiceMapper.java

@@ -0,0 +1,4 @@
+package doctor.mapper;
+
+public interface InquiryVerifyServiceMapper {
+}

doctor-modules/doctor-health/src/main/java/doctor/mapper/SickCircleMapper.java

@@ -0,0 +1,12 @@
+package doctor.mapper;
+
+import doctor.domain.entity.SickCircleEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface SickCircleMapper {
+    List<SickCircleEntity> findSickCircleList(Integer departmentId);
+
+}

doctor-modules/doctor-health/src/main/java/doctor/service/HealthJobTitleService.java

@@ -3,9 +3,7 @@ package doctor.service;
 import doctor.common.core.domain.HealthR;
 import doctor.domain.dto.ApplyJoinDto;
 import doctor.domain.entity.DoctorJobTitleEntity;
-import doctor.domain.vo.DoctorVo;
-import doctor.domain.vo.FindImagePicVo;
-import io.swagger.models.auth.In;
+import doctor.domain.vo.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -22,4 +20,16 @@ public interface HealthJobTitleService {
     List<FindImagePicVo> findSystemImagePic();
 
     HealthR uploadImagePic(MultipartFile imagePic, Integer doctorId, String sessionId);
+
+    HealthR checkCode(String email, String code);
+
+    WalletVo findDoctorWallet(Integer doctorId);
+
+    List<DoctorIncomeRecordVo> findDoctorIncomeRecordList(Integer doctorId,Integer page, Integer count);
+
+    HealthR drawCash(Integer doctorId, Integer money);
+
+    HealthR<List<DoctorHistoryInquiryVo>> findHistoryInquiryRecord(Integer page, Integer size);
+
+    List<NoticeReadNumVo> findDoctorNoticeReadNum(Integer doctorId);
 }

doctor-modules/doctor-health/src/main/java/doctor/service/InquiryVerifyService.java

@@ -0,0 +1,11 @@
+package doctor.service;
+
+import doctor.common.core.domain.HealthR;
+import doctor.domain.vo.InquiryRecordVo;
+
+import java.util.List;
+
+public interface InquiryVerifyService {
+    List<InquiryRecordVo> findInquiryRecordList();
+
+}

doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleService.java

@@ -0,0 +1,11 @@
+package doctor.service;
+
+import doctor.common.core.domain.HealthR;
+import doctor.domain.vo.SickCircleVo;
+
+import java.util.List;
+
+public interface SickCircleService {
+    List<SickCircleVo> findSickCircleList(Integer page, Integer size, Integer departmentId);
+
+}

doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthJobTitleServiceImpl.java

@@ -1,11 +1,14 @@
 package doctor.service.impl;
 
 import doctor.common.core.domain.HealthR;
+import doctor.common.core.web.controller.BaseController;
 import doctor.common.security.service.TokenService;
 import doctor.domain.dto.ApplyJoinDto;
+import doctor.domain.entity.DoctorIncomeRecordEntity;
 import doctor.domain.entity.DoctorJobTitleEntity;
-import doctor.domain.vo.DoctorVo;
-import doctor.domain.vo.FindImagePicVo;
+import doctor.domain.entity.DoctorWalletEntity;
+import doctor.domain.entity.doctorSystemNoticeEntity;
+import doctor.domain.vo.*;
 import doctor.mapper.HealthJobTitleMapper;
 import doctor.service.HealthJobTitleService;
 import doctor.system.api.domain.Department;
@@ -15,7 +18,7 @@ import doctor.util.OssUtil;
 import doctor.util.RSAUtils;
 import doctor.util.RsaKey;
 import doctor.util.SendEmail;
-import org.bouncycastle.jcajce.provider.asymmetric.rsa.RSAUtil;
+import lombok.extern.log4j.Log4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -30,7 +33,7 @@ import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
 @Service
-public class HealthJobTitleServiceImpl implements HealthJobTitleService {
+public class HealthJobTitleServiceImpl extends BaseController implements HealthJobTitleService {
     @Autowired
     private HealthJobTitleMapper healthJobTitleMapper;
     @Autowired
@@ -130,4 +133,70 @@ public class HealthJobTitleServiceImpl implements HealthJobTitleService {
         tokenService.createToken(loginUser);
         return HealthR.ok(s);
     }
+
+    @Override
+    public HealthR checkCode(String email, String code) {
+        if (email==null||email.equals("")){
+            return HealthR.fail();
+        }
+        if (code==null||code.equals("")){
+            return HealthR.fail();
+        }
+        if (!redisTemplate.hasKey(email)){
+            return HealthR.fail();
+        }
+        Integer integer = redisTemplate.opsForValue().get(email);
+        if (!String.valueOf(integer).equals(code)){
+            return HealthR.fail();
+        }
+        return HealthR.ok();
+    }
+
+    @Override
+    public WalletVo findDoctorWallet(Integer doctorId) {
+        WalletVo walletVo=new WalletVo();
+        DoctorWalletEntity doctorWalletEntity = healthJobTitleMapper.findDoctorWalletById(doctorId);
+        BeanUtils.copyProperties(doctorWalletEntity,walletVo);
+        walletVo.setWhetherBindIdCard(1);
+        walletVo.setWhetherBindBankCard(1);
+        return walletVo;
+    }
+
+    @Override
+    public List<DoctorIncomeRecordVo> findDoctorIncomeRecordList(Integer doctorId, Integer page, Integer count) {
+        List<DoctorIncomeRecordEntity> doctorIncomeRecordList = healthJobTitleMapper.findDoctorIncomeRecordList(doctorId);
+        ArrayList<DoctorIncomeRecordVo> doctorIncomeRecordVos = new ArrayList<>();
+        for (DoctorIncomeRecordEntity doctorIncomeRecordEntity : doctorIncomeRecordList) {
+            DoctorIncomeRecordVo doctorIncomeRecordVo = new DoctorIncomeRecordVo();
+            BeanUtils.copyProperties(doctorIncomeRecordEntity,doctorIncomeRecordVo);
+            doctorIncomeRecordVos.add(doctorIncomeRecordVo);
+        }
+        return doctorIncomeRecordVos;
+    }
+
+    @Override
+    public HealthR drawCash(Integer doctorId, Integer money) {
+
+        return null;
+    }
+
+    @Override
+    public HealthR<List<DoctorHistoryInquiryVo>> findHistoryInquiryRecord(Integer page, Integer size) {
+        startPage(page,size);
+
+        return null;
+    }
+
+    @Override
+    public List<NoticeReadNumVo> findDoctorNoticeReadNum(Integer doctorId) {
+        List<doctorSystemNoticeEntity> doctorSystemNoticeEntities = healthJobTitleMapper.findDoctorNoticeReadNum(doctorId);
+        ArrayList<NoticeReadNumVo> noticeReadNumVos = new ArrayList<>();
+        for (doctorSystemNoticeEntity doctorSystemNoticeEntity : doctorSystemNoticeEntities) {
+            NoticeReadNumVo noticeReadNumVo = new NoticeReadNumVo();
+            noticeReadNumVo.setNotReadNum(doctorSystemNoticeEntity.getNum());
+            noticeReadNumVo.setNoticeType(doctorSystemNoticeEntity.getNoticeType());
+            noticeReadNumVos.add(noticeReadNumVo);
+        }
+        return noticeReadNumVos;
+    }
 }

doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryVerifyServiceImpl.java

@@ -0,0 +1,22 @@
+package doctor.service.impl;
+
+import doctor.common.core.web.controller.BaseController;
+import doctor.domain.vo.InquiryRecordVo;
+import doctor.mapper.InquiryVerifyServiceMapper;
+import doctor.service.InquiryVerifyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class InquiryVerifyServiceImpl extends BaseController implements InquiryVerifyService {
+    @Autowired
+    private InquiryVerifyServiceMapper inquiryVerifyServiceMapper;
+
+    @Override
+    public List<InquiryRecordVo> findInquiryRecordList() {
+
+        return null;
+    }
+}

doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServiceImpl.java

@@ -0,0 +1,33 @@
+package doctor.service.impl;
+
+import doctor.common.core.domain.HealthR;
+import doctor.common.core.web.controller.BaseController;
+import doctor.domain.entity.SickCircleEntity;
+import doctor.domain.vo.SickCircleVo;
+import doctor.mapper.SickCircleMapper;
+import doctor.service.SickCircleService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class SickCircleServiceImpl extends BaseController implements SickCircleService {
+
+    @Autowired
+    private SickCircleMapper sickCircleMapper;
+    @Override
+    public List<SickCircleVo> findSickCircleList(Integer page, Integer size, Integer departmentId) {
+        List<SickCircleEntity> list = sickCircleMapper.findSickCircleList(departmentId);
+        ArrayList<SickCircleVo> sickCircleVos = new ArrayList<>();
+        for (SickCircleEntity sickCircleEntity : list) {
+            SickCircleVo sickCircleVo = new SickCircleVo();
+            sickCircleVo.setSickCircleId(sickCircleEntity.getId());
+            BeanUtils.copyProperties(sickCircleEntity,sickCircleVo);
+            sickCircleVos.add(sickCircleVo);
+        }
+        return sickCircleVos;
+    }
+}

doctor-modules/doctor-health/src/main/resources/mapper/doctor/HealthJobTitleMapper.xml

@@ -28,4 +28,13 @@
     <select id="findDoctorImgPic" resultType="java.lang.String">
         select image_pic from doctor
     </select>
+    <select id="findDoctorWalletById" resultType="doctor.domain.entity.DoctorWalletEntity">
+        select * from doctor_wallet where doctor_id=#{doctorId}
+    </select>
+    <select id="findDoctorIncomeRecordList" resultType="doctor.domain.entity.DoctorIncomeRecordEntity">
+        select * from doctor_income_record where doctor_id=#{doctorId}
+    </select>
+    <select id="findDoctorNoticeReadNum" resultType="doctor.domain.entity.doctorSystemNoticeEntity">
+        SELECT COUNT(id) num,notice_type FROM doctor_system_notice where receive_doctor_id=#{doctorId} and status=2 GROUP BY notice_type
+    </select>
 </mapper>

doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryVerifyServiceMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="doctor.mapper.InquiryVerifyServiceMapper">
+
+
+</mapper>

doctor-modules/doctor-health/src/main/resources/mapper/doctor/SickCircleMapper.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="doctor.mapper.SickCircleMapper">
+
+
+    <select id="findSickCircleList" resultType="doctor.domain.entity.SickCircleEntity">
+        SELECT * FROM sick_circle WHERE department_id = #{departmentId}
+    </select>
+</mapper>

doctor-modules/doctor-system/src/main/java/doctor/system/service/impl/SysDictTypeServiceImpl.java

@@ -20,7 +20,7 @@ import doctor.system.service.ISysDictTypeService;
 
 /**
  * 字典 业务层处理
- * 
+ *
  * @author ruoyi
  */
 @Service
@@ -43,7 +43,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
 
     /**
      * 根据条件分页查询字典类型
-     * 
+     *
      * @param dictType 字典类型信息
      * @return 字典类型集合信息
      */
@@ -55,7 +55,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
 
     /**
      * 根据所有字典类型
-     * 
+     *
      * @return 字典类型集合信息
      */
     @Override
@@ -66,7 +66,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
 
     /**
      * 根据字典类型查询字典数据
-     * 
+     *
      * @param dictType 字典类型
      * @return 字典数据集合信息
      */
@@ -89,7 +89,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
 
     /**
      * 根据字典类型ID查询信息
-     * 
+     *
      * @param dictId 字典类型ID
      * @return 字典类型
      */
@@ -101,7 +101,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
 
     /**
      * 根据字典类型查询信息
-     * 
+     *
      * @param dictType 字典类型
      * @return 字典类型
      */
@@ -113,7 +113,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
 
     /**
      * 批量删除字典类型信息
-     * 
+     *
      * @param dictIds 需要删除的字典ID
      */
     @Override
@@ -167,7 +167,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
 
     /**
      * 新增保存字典类型信息
-     * 
+     *
      * @param dict 字典类型信息
      * @return 结果
      */
@@ -184,7 +184,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
 
     /**
      * 修改保存字典类型信息
-     * 
+     *
      * @param dict 字典类型信息
      * @return 结果
      */
@@ -205,13 +205,12 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
 
     /**
      * 校验字典类型称是否唯一
-     * 
+     *
      * @param dict 字典类型
      * @return 结果
      */
     @Override
-    public boolean checkDictTypeUnique(SysDictType dict)
-    {
+    public boolean checkDictTypeUnique(SysDictType dict) {
         Long dictId = StringUtils.isNull(dict.getDictId()) ? -1L : dict.getDictId();
         SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType());
         if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue())

doctor-modules/doctor-system/src/main/java/doctor/system/service/impl/SysPermissionServiceImpl.java

@@ -14,7 +14,7 @@ import doctor.system.service.ISysRoleService;
 
 /**
  * 用户权限处理
- * 
+ *
  * @author ruoyi
  */
 @Service
@@ -28,7 +28,7 @@ public class SysPermissionServiceImpl implements ISysPermissionService
 
     /**
      * 获取角色数据权限
-     * 
+     *
      * @param userId 用户Id
      * @return 角色权限信息
      */
@@ -50,8 +50,8 @@ public class SysPermissionServiceImpl implements ISysPermissionService
 
     /**
      * 获取菜单数据权限
-     * 
-     * @param userId 用户Id
+     *
+     * @param user 用户Id
      * @return 菜单权限信息
      */
     @Override