diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthJobTitleController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthJobTitleController.java index 9a8a938..1d37ef0 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthJobTitleController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthJobTitleController.java @@ -10,7 +10,6 @@ import doctor.domain.entity.DoctorJobTitleEntity; 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; @@ -27,30 +26,16 @@ public class HealthJobTitleController { private BannersService bannersService; - - @GetMapping("/findDoctorNoticeReadNum") - public HealthR> findDoctorNoticeReadNum(@RequestHeader Integer doctorId, - @RequestHeader String sessionId) { - List healthR = healthJobTitleService.findDoctorNoticeReadNum(doctorId); - return HealthR.ok(healthR); - } - @GetMapping("/findHistoryInquiryRecord") public HealthR> findHistoryInquiryRecord(@RequestHeader Integer doctorId, @RequestHeader String sessionId, @RequestParam Integer page, @RequestParam Integer size) { HealthR> healthR = healthJobTitleService.findHistoryInquiryRecord(page, size); - return null; + return healthR; } - @GetMapping("/findDoctorWallet") - public HealthR findDoctorWallet(@RequestHeader Integer doctorId, - @RequestHeader String sessionId) { - WalletVo healthR = healthJobTitleService.findDoctorWallet(doctorId); - return HealthR.ok(healthR); - } @PostMapping("/drawCash") public HealthR drawCash(@RequestHeader Integer doctorId, @@ -60,14 +45,6 @@ public class HealthJobTitleController { return healthR; } - @GetMapping("/findDoctorIncomeRecordList") - public HealthR> findDoctorIncomeRecordList(@RequestHeader Integer doctorId, - @RequestHeader String sessionId, - @RequestParam Integer page, - @RequestParam Integer count) { - List doctorIncomeRecordEntities = healthJobTitleService.findDoctorIncomeRecordList(doctorId, page, count); - return HealthR.ok(doctorIncomeRecordEntities); - } @GetMapping("/bannersShow") public HealthR> bannersShow() { @@ -101,22 +78,11 @@ public class HealthJobTitleController { return healthR; } - @GetMapping("/findDoctorById") - public HealthR findDoctorById(@RequestHeader Integer doctorId, - @RequestHeader String sessionId) { - return HealthR.ok(healthJobTitleService.findDoctorById(doctorId)); - } + @GetMapping("/findSystemImagePic") public HealthR> 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)); - } - } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthSickController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthSickController.java index ba5e4f8..bbdb006 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthSickController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthSickController.java @@ -1,6 +1,9 @@ package doctor.controller; import doctor.common.core.domain.HealthR; +import doctor.common.core.web.controller.BaseController; +import doctor.domain.vo.SearchSickCircleVo; +import doctor.domain.vo.SickCircleInfoVo; import doctor.domain.vo.SickCircleVo; import doctor.service.SickCircleService; import org.springframework.beans.factory.annotation.Autowired; @@ -13,7 +16,7 @@ import java.util.List; @RestController @RequestMapping("/sickCircle/v1") -public class HealthSickController { +public class HealthSickController { @Autowired private SickCircleService sickCircleService; @@ -25,4 +28,15 @@ public class HealthSickController { List sickCircleList = sickCircleService.findSickCircleList(page, count, departmentId); return HealthR.ok(sickCircleList); } + + @GetMapping("/findSickCircleInfo") + public HealthR findSickCircleInfo(@RequestParam Integer sickCircleId) { + SickCircleInfoVo sickCircleInfoVo = sickCircleService.findSickCircleInfo(sickCircleId); + return HealthR.ok(sickCircleInfoVo); + } + @GetMapping("/searchSickCircle") + public HealthR> searchSickCircle(@RequestParam String keyWord) { + List searchSickCircleVoList = sickCircleService.searchSickCircle(keyWord); + return HealthR.ok(searchSickCircleVoList); + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthVerifyController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthVerifyController.java new file mode 100644 index 0000000..7064ae0 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthVerifyController.java @@ -0,0 +1,56 @@ +package doctor.controller; + +import doctor.common.core.domain.HealthR; +import doctor.domain.vo.DoctorIncomeRecordVo; +import doctor.domain.vo.DoctorVo; +import doctor.domain.vo.NoticeReadNumVo; +import doctor.domain.vo.WalletVo; +import doctor.service.HealthJobTitleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; + +@RestController +@RequestMapping("/verify/v1") +public class HealthVerifyController { + @Autowired + private HealthJobTitleService healthJobTitleService; + @GetMapping("/findDoctorById") + public HealthR findDoctorById(@RequestHeader Integer doctorId, + @RequestHeader String sessionId) { + return HealthR.ok(healthJobTitleService.findDoctorById(doctorId)); + } + + @GetMapping("/findDoctorNoticeReadNum") + public HealthR> findDoctorNoticeReadNum(@RequestHeader Integer doctorId, + @RequestHeader String sessionId) { + List healthR = healthJobTitleService.findDoctorNoticeReadNum(doctorId); + return HealthR.ok(healthR); + } + + @PostMapping("/uploadImagePic") + public HealthR uploadImagePic(@RequestParam("imagePic") MultipartFile imagePic, + @RequestHeader String sessionId, + @RequestHeader Integer doctorId) { + return HealthR.ok(healthJobTitleService.uploadImagePic(imagePic, doctorId, sessionId)); + } + + @GetMapping("/findDoctorIncomeRecordList") + public HealthR> findDoctorIncomeRecordList(@RequestHeader Integer doctorId, + @RequestHeader String sessionId, + @RequestParam Integer page, + @RequestParam Integer count) { + List doctorIncomeRecordEntities = healthJobTitleService.findDoctorIncomeRecordList(doctorId, page, count); + return HealthR.ok(doctorIncomeRecordEntities); + } + + @GetMapping("/findDoctorWallet") + public HealthR findDoctorWallet(@RequestHeader Integer doctorId, + @RequestHeader String sessionId) { + + WalletVo healthR = healthJobTitleService.findDoctorWallet(doctorId); + return HealthR.ok(healthR); + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleEntity.java index 99468ef..fb7326e 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleEntity.java @@ -9,7 +9,7 @@ import java.util.Date; @Data public class SickCircleEntity { - private Integer id; + private Integer sickCircleId; private Integer userId; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SearchSickCircleVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SearchSickCircleVo.java new file mode 100644 index 0000000..1c628d7 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SearchSickCircleVo.java @@ -0,0 +1,15 @@ +package doctor.domain.vo; + +import lombok.Data; + +import java.util.Date; + +@Data +public class SearchSickCircleVo { + private Integer sickCircleId; + private String title; + private String detail; + private Integer amount; + private Date releaseTime; + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleInfoVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleInfoVo.java new file mode 100644 index 0000000..ad33e99 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleInfoVo.java @@ -0,0 +1,25 @@ +package doctor.domain.vo; + +import lombok.Data; + +import java.util.Date; + +@Data +public class SickCircleInfoVo { + private Integer id; + private Integer userId; + private String authorName; + private String title; + private Integer departmentId; + private String departmentName; + private String disease; + private String detail; + private String treatmentHospital; + private Date treatmentStartTime; + private Date treatmentEndTime; + private String treatmentProcess; + private String picture; + private Integer amount; + private String content; + private Integer whetherContent; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleVo.java index 6ccc422..cdd0855 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleVo.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleVo.java @@ -2,11 +2,13 @@ package doctor.domain.vo; import lombok.Data; +import java.util.Date; + @Data public class SickCircleVo { private Integer sickCircleId; private String title; private String detail; - private long releaseTime; + private Date releaseTime; private Integer amount; } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/SickCircleMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/SickCircleMapper.java index ae8f55a..7692b4e 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/SickCircleMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/SickCircleMapper.java @@ -1,6 +1,8 @@ package doctor.mapper; import doctor.domain.entity.SickCircleEntity; +import doctor.domain.vo.SearchSickCircleVo; +import doctor.domain.vo.SickCircleInfoVo; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -9,4 +11,7 @@ import java.util.List; public interface SickCircleMapper { List findSickCircleList(Integer departmentId); + SickCircleInfoVo findSickCircleInfo(Integer sickCircleId); + + List searchSickCircle(String keyWord); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleService.java index 81a47ef..f10a160 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleService.java @@ -1,11 +1,16 @@ package doctor.service; import doctor.common.core.domain.HealthR; +import doctor.domain.vo.SearchSickCircleVo; +import doctor.domain.vo.SickCircleInfoVo; import doctor.domain.vo.SickCircleVo; import java.util.List; public interface SickCircleService { - List findSickCircleList(Integer page, Integer size, Integer departmentId); + List findSickCircleList(Integer page, Integer count, Integer departmentId); + SickCircleInfoVo findSickCircleInfo(Integer sickCircleId); + + List searchSickCircle(String keyWord); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthJobTitleServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthJobTitleServiceImpl.java index 98ad438..3e68c2c 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthJobTitleServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthJobTitleServiceImpl.java @@ -164,7 +164,7 @@ public class HealthJobTitleServiceImpl extends BaseController implements HealthJ @Override public List findDoctorIncomeRecordList(Integer doctorId, Integer page, Integer count) { - startPage(page,count); + List doctorIncomeRecordList = healthJobTitleMapper.findDoctorIncomeRecordList(doctorId); ArrayList doctorIncomeRecordVos = new ArrayList<>(); for (DoctorIncomeRecordEntity doctorIncomeRecordEntity : doctorIncomeRecordList) { diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServiceImpl.java index f314126..18b1776 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServiceImpl.java @@ -3,6 +3,8 @@ 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.SearchSickCircleVo; +import doctor.domain.vo.SickCircleInfoVo; import doctor.domain.vo.SickCircleVo; import doctor.mapper.SickCircleMapper; import doctor.service.SickCircleService; @@ -19,16 +21,25 @@ public class SickCircleServiceImpl extends BaseController implements SickCircleS @Autowired private SickCircleMapper sickCircleMapper; @Override - public List findSickCircleList(Integer page, Integer size, Integer departmentId) { - startPage(page,size); + public List findSickCircleList(Integer page, Integer count, Integer departmentId) { List list = sickCircleMapper.findSickCircleList(departmentId); ArrayList sickCircleVos = new ArrayList<>(); for (SickCircleEntity sickCircleEntity : list) { SickCircleVo sickCircleVo = new SickCircleVo(); - sickCircleVo.setSickCircleId(sickCircleEntity.getId()); + sickCircleVo.setSickCircleId(sickCircleEntity.getSickCircleId()); BeanUtils.copyProperties(sickCircleEntity,sickCircleVo); sickCircleVos.add(sickCircleVo); } return sickCircleVos; } + + @Override + public SickCircleInfoVo findSickCircleInfo(Integer sickCircleId) { + return sickCircleMapper.findSickCircleInfo(sickCircleId); + } + + @Override + public List searchSickCircle(String keyWord) { + return sickCircleMapper.searchSickCircle(keyWord); + } } diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/SickCircleMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/SickCircleMapper.xml index 1e82943..94eca4e 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/SickCircleMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/SickCircleMapper.xml @@ -8,4 +8,10 @@ + +