cbx
/
Medical_Treatment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "1.17" 

This reverts commit f0c7d44551.
cbx
chenbingxuan 2024-01-17 11:46:46 +08:00
parent f0c7d44551
commit 690e465eea
12 changed files with 44 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
doctor-modules/doctor-health/src/main/java/doctor/controller/HealthJobTitleController.java
View File

@ -10,6 +10,7 @@ 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;
@ -26,16 +27,30 @@ public class HealthJobTitleController {
private BannersService bannersService;
@GetMapping("/findDoctorNoticeReadNum")
public HealthR<List<NoticeReadNumVo>> findDoctorNoticeReadNum(@RequestHeader Integer doctorId,
@RequestHeader String sessionId) {
List<NoticeReadNumVo> healthR = healthJobTitleService.findDoctorNoticeReadNum(doctorId);
return HealthR.ok(healthR);
}
@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 healthR;
return null;
}
@GetMapping("/findDoctorWallet")
public HealthR<WalletVo> findDoctorWallet(@RequestHeader Integer doctorId,
@RequestHeader String sessionId) {
WalletVo healthR = healthJobTitleService.findDoctorWallet(doctorId);
return HealthR.ok(healthR);
}
@PostMapping("/drawCash")
public HealthR drawCash(@RequestHeader Integer doctorId,
@ -45,6 +60,14 @@ public class HealthJobTitleController {
return healthR;
}
@GetMapping("/findDoctorIncomeRecordList")
public HealthR<List<DoctorIncomeRecordVo>> findDoctorIncomeRecordList(@RequestHeader Integer doctorId,
@RequestHeader String sessionId,
@RequestParam Integer page,
@RequestParam Integer count) {
List<DoctorIncomeRecordVo> doctorIncomeRecordEntities = healthJobTitleService.findDoctorIncomeRecordList(doctorId, page, count);
return HealthR.ok(doctorIncomeRecordEntities);
}
@GetMapping("/bannersShow")
public HealthR<List<Banners>> bannersShow() {
@ -78,11 +101,22 @@ public class HealthJobTitleController {
return healthR;
}
@GetMapping("/findDoctorById")
public HealthR<DoctorVo> findDoctorById(@RequestHeader Integer doctorId,
@RequestHeader String sessionId) {
return HealthR.ok(healthJobTitleService.findDoctorById(doctorId));
}
@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));
}
}

14
doctor-modules/doctor-health/src/main/java/doctor/controller/HealthSickController.java
View File

@ -1,9 +1,6 @@
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;
@ -28,15 +25,4 @@ public class HealthSickController {
List<SickCircleVo> sickCircleList = sickCircleService.findSickCircleList(page, count, departmentId);
return HealthR.ok(sickCircleList);
}
@GetMapping("/findSickCircleInfo")
public HealthR<SickCircleInfoVo> findSickCircleInfo(@RequestParam Integer sickCircleId) {
SickCircleInfoVo sickCircleInfoVo = sickCircleService.findSickCircleInfo(sickCircleId);
return HealthR.ok(sickCircleInfoVo);
}
@GetMapping("/searchSickCircle")
public HealthR<List<SearchSickCircleVo>> searchSickCircle(@RequestParam String keyWord) {
List<SearchSickCircleVo> searchSickCircleVoList = sickCircleService.searchSickCircle(keyWord);
return HealthR.ok(searchSickCircleVoList);
}
}

56
doctor-modules/doctor-health/src/main/java/doctor/controller/HealthVerifyController.java
View File

@ -1,56 +0,0 @@
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<DoctorVo> findDoctorById(@RequestHeader Integer doctorId,
@RequestHeader String sessionId) {
return HealthR.ok(healthJobTitleService.findDoctorById(doctorId));
}
@GetMapping("/findDoctorNoticeReadNum")
public HealthR<List<NoticeReadNumVo>> findDoctorNoticeReadNum(@RequestHeader Integer doctorId,
@RequestHeader String sessionId) {
List<NoticeReadNumVo> 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<List<DoctorIncomeRecordVo>> findDoctorIncomeRecordList(@RequestHeader Integer doctorId,
@RequestHeader String sessionId,
@RequestParam Integer page,
@RequestParam Integer count) {
List<DoctorIncomeRecordVo> doctorIncomeRecordEntities = healthJobTitleService.findDoctorIncomeRecordList(doctorId, page, count);
return HealthR.ok(doctorIncomeRecordEntities);
}
@GetMapping("/findDoctorWallet")
public HealthR<WalletVo> findDoctorWallet(@RequestHeader Integer doctorId,
@RequestHeader String sessionId) {
WalletVo healthR = healthJobTitleService.findDoctorWallet(doctorId);
return HealthR.ok(healthR);
}
}

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

@ -9,7 +9,7 @@ import java.util.Date;
@Data
public class SickCircleEntity {
private Integer sickCircleId;
private Integer id;
private Integer userId;

15
doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SearchSickCircleVo.java
View File

@ -1,15 +0,0 @@
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;
}

25
doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleInfoVo.java
View File

@ -1,25 +0,0 @@
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;
}

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

@ -2,13 +2,11 @@ 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 Date releaseTime;
private long releaseTime;
private Integer amount;
}

5
doctor-modules/doctor-health/src/main/java/doctor/mapper/SickCircleMapper.java
View File

@ -1,8 +1,6 @@
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;
@ -11,7 +9,4 @@ import java.util.List;
public interface SickCircleMapper {
List<SickCircleEntity> findSickCircleList(Integer departmentId);
SickCircleInfoVo findSickCircleInfo(Integer sickCircleId);
List<SearchSickCircleVo> searchSickCircle(String keyWord);
}

7
doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleService.java
View File

@ -1,16 +1,11 @@
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<SickCircleVo> findSickCircleList(Integer page, Integer count, Integer departmentId);
List<SickCircleVo> findSickCircleList(Integer page, Integer size, Integer departmentId);
SickCircleInfoVo findSickCircleInfo(Integer sickCircleId);
List<SearchSickCircleVo> searchSickCircle(String keyWord);
}

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

@ -164,7 +164,7 @@ public class HealthJobTitleServiceImpl extends BaseController implements HealthJ
@Override
public List<DoctorIncomeRecordVo> findDoctorIncomeRecordList(Integer doctorId, Integer page, Integer count) {
startPage(page,count);
List<DoctorIncomeRecordEntity> doctorIncomeRecordList = healthJobTitleMapper.findDoctorIncomeRecordList(doctorId);
ArrayList<DoctorIncomeRecordVo> doctorIncomeRecordVos = new ArrayList<>();
for (DoctorIncomeRecordEntity doctorIncomeRecordEntity : doctorIncomeRecordList) {

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

@ -3,8 +3,6 @@ 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;
@ -21,25 +19,16 @@ public class SickCircleServiceImpl extends BaseController implements SickCircleS
@Autowired
private SickCircleMapper sickCircleMapper;
@Override
public List<SickCircleVo> findSickCircleList(Integer page, Integer count, Integer departmentId) {
public List<SickCircleVo> findSickCircleList(Integer page, Integer size, Integer departmentId) {
startPage(page,size);
List<SickCircleEntity> list = sickCircleMapper.findSickCircleList(departmentId);
ArrayList<SickCircleVo> sickCircleVos = new ArrayList<>();
for (SickCircleEntity sickCircleEntity : list) {
SickCircleVo sickCircleVo = new SickCircleVo();
sickCircleVo.setSickCircleId(sickCircleEntity.getSickCircleId());
sickCircleVo.setSickCircleId(sickCircleEntity.getId());
BeanUtils.copyProperties(sickCircleEntity,sickCircleVo);
sickCircleVos.add(sickCircleVo);
}
return sickCircleVos;
}
@Override
public SickCircleInfoVo findSickCircleInfo(Integer sickCircleId) {
return sickCircleMapper.findSickCircleInfo(sickCircleId);
}
@Override
public List<SearchSickCircleVo> searchSickCircle(String keyWord) {
return sickCircleMapper.searchSickCircle(keyWord);
}
}

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

@ -8,10 +8,4 @@
<select id="findSickCircleList" resultType="doctor.domain.entity.SickCircleEntity">
SELECT * FROM sick_circle WHERE department_id = #{departmentId}
</select>
<select id="findSickCircleInfo" resultType="doctor.domain.vo.SickCircleInfoVo">
SELECT * FROM sick_circle WHERE sick_circle_id = #{sickCircleId}
</select>
<select id="searchSickCircle" resultType="doctor.domain.vo.SearchSickCircleVo">
SELECT * FROM sick_circle WHERE title LIKE CONCAT('%',#{keyWord},'%')
</select>
</mapper>