four
/
dimensional-health-interrogation
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

重构远程调用接口

master
MKing 2023-11-06 08:44:39 +08:00
parent 7f19270439
commit c44f59132b
13 changed files with 184 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pom.xml
View File

@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>dimensional-health-interrogation</artifactId> <artifactId>dimensional-health-interrogation</artifactId>
<version>1.0-SNAPSHOT</version> <version>3.6.3</version>
<properties> <properties>
<maven.compiler.source>17</maven.compiler.source> <maven.compiler.source>17</maven.compiler.source>
@ -17,7 +17,6 @@
<groupId>com.four</groupId> <groupId>com.four</groupId>
<artifactId>four-dimensional-health</artifactId> <artifactId>four-dimensional-health</artifactId>
<version>3.6.3</version> <version>3.6.3</version>
<relativePath />
</parent> </parent>
<dependencies> <dependencies>
<!-- SpringCloud Alibaba Nacos --> <!-- SpringCloud Alibaba Nacos -->
@ -86,6 +85,12 @@
<version>2.4</version> <version>2.4</version>
<classifier>jdk15</classifier> <classifier>jdk15</classifier>
</dependency> </dependency>
<dependency>
<groupId>com.four</groupId>
<artifactId>four-modules-system</artifactId>
<version>3.6.4</version>
</dependency>
<dependency> <dependency>
<groupId>com.easemob.im</groupId> <groupId>com.easemob.im</groupId>
<artifactId>im-sdk-core</artifactId> <artifactId>im-sdk-core</artifactId>
@ -112,4 +117,36 @@
<artifactId>spring-boot-starter-web-services</artifactId> <artifactId>spring-boot-starter-web-services</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<repositories>
<repository>
<id>menghang-public</id>
<name>menghang-public</name>
<url>http://47.120.41.128:8081/repository/maven-public/</url>
</repository>
</repositories>
<distributionManagement>
<repository>
<id>menghang-releases</id>
<name>menghang-releases</name>
<url>http://47.120.41.128:8081/repository/maven-releases/</url>
</repository>
</distributionManagement>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>

10
src/main/java/com/four/patient/controller/FollowDoctorController.java
View File

@ -51,16 +51,6 @@ public class FollowDoctorController {
return Result.success(i,"取消关注"); return Result.success(i,"取消关注");
} }
// @PostMapping("/delFollowDoctor")
// public Result delFollowDocter(@RequestParam Integer registrationInformationId)
// {
// log.info("功能名称:取消关注，请求URI:{},请求方式:{},请求参数:{}",request.getRequestURI(),
// request.getMethod(),JSONObject.toJSONString(registrationInformationId));
// Integer i = followDoctorService.delFollowDoctor(registrationInformationId);
// log.info("功能名称:取消关注,请求URI,{},请求方法:{},返回结果:{}",request.getRequestURI(),
// request.getMethod(),JSONObject.toJSONString(i));
// return Result.success(i,"取消关注");
// }
/*** /***
* 我的关注 * 我的关注
* @return * @return

6
src/main/java/com/four/patient/controller/HistoricalConsultationController.java
View File

@ -24,16 +24,16 @@ public class HistoricalConsultationController {
private HttpServletRequest request; private HttpServletRequest request;
/** /**
* 结束问诊时添加问诊记录并付问诊金额 *问诊时添加问诊记录并付问诊金额
* @param historicalConsultation * @param historicalConsultation
* @return * @return
*/ */
@PostMapping("/insertHistoricalConsultation") @PostMapping("/insertHistoricalConsultation")
public Result insertHistoricalConsultation(@RequestBody HistoricalConsultation historicalConsultation){ public Result insertHistoricalConsultation(@RequestBody HistoricalConsultation historicalConsultation){
log.info("功能名称:结束问诊后生成历史记录并结算诊金,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(), log.info("功能名称:问诊生成历史记录并结算诊金,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(),
request.getMethod(), JSONObject.toJSONString(historicalConsultation)); request.getMethod(), JSONObject.toJSONString(historicalConsultation));
Integer i=historicalConsultationService.insertHistoricalConsultation(historicalConsultation); Integer i=historicalConsultationService.insertHistoricalConsultation(historicalConsultation);
log.info("功能名称:结束问诊后生成历史记录并结算诊金,请求URI:{},请求方法:{},返回结果:{}",request.getRequestURI(), log.info("功能名称:问诊生成历史记录并结算诊金,请求URI:{},请求方法:{},返回结果:{}",request.getRequestURI(),
request.getMethod(),JSONObject.toJSONString(i)); request.getMethod(),JSONObject.toJSONString(i));
return Result.success(i,"历史记录添加成功"); return Result.success(i,"历史记录添加成功");
} }

71
src/main/java/com/four/patient/controller/RegistrationInformationController.java
View File

@ -6,6 +6,8 @@ import com.four.common.core.domain.Result;
import com.four.common.duck.communitypatients.SymptomsDrugs; import com.four.common.duck.communitypatients.SymptomsDrugs;
import com.four.common.duck.response.ResponseRegistrationInformation; import com.four.common.duck.response.ResponseRegistrationInformation;
import com.four.patient.service.RegistrationInformationService; import com.four.patient.service.RegistrationInformationService;
import com.four.system.api.domain.SysDoctor;
import com.four.system.api.domain.SysRegistrationInformation;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -47,13 +49,13 @@ public class RegistrationInformationController {
* @return * @return
*/ */
@PostMapping("/ShowRegistrationInformationAllPrice") @PostMapping("/ShowRegistrationInformationAllPrice")
public Result<List<ResponseRegistrationInformation>> ShowRegistrationInformationAllPrice(@RequestParam Long medicalDepartmentId){ public Result<List<SysDoctor>> ShowRegistrationInformationAllPrice(@RequestParam Long medicalDepartmentId){
log.info("功能名称:查询价格倒序的医生信息,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(), log.info("功能名称:查询价格倒序的医生信息,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(),
request.getMethod(),JSONObject.toJSONString(medicalDepartmentId)); request.getMethod(),JSONObject.toJSONString(medicalDepartmentId));
List<ResponseRegistrationInformation> list=registrationInformationService.ShowRegistrationInformationAllPrice(medicalDepartmentId); List<SysDoctor> list=registrationInformationService.ShowRegistrationInformationAllPrice(medicalDepartmentId);
log.info("功能名称:查询价格倒序到医生信息,请求URI:{},请求方法:{},返回结果:{}",request.getRequestURI(), log.info("功能名称:查询价格倒序的医生信息,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(),
request.getMethod(),JSONObject.toJSONString(list)); request.getMethod(),JSONObject.toJSONString(list));
return Result.success(list); return Result.success(list,"查询成功");
} }
@ -63,14 +65,13 @@ public class RegistrationInformationController {
* @return * @return
*/ */
@PostMapping("/ShowRegistrationInformationNumber") @PostMapping("/ShowRegistrationInformationNumber")
public Result<List<ResponseRegistrationInformation>> ShowRegistrationInformationNumber(@RequestParam Long medicalDepartmentId){ public Result<List<SysDoctor>> ShowRegistrationInformationNumber(@RequestParam Long medicalDepartmentId){
log.info("功能名称:查询不同科室医生诊金倒序信息,请求URI:{}。请求方法:{},请求参数:{}",request.getRequestURI(), log.info("功能名称:查询不同科室接待患者人数倒序医生信息,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(),
request.getMethod(),JSONObject.toJSONString(medicalDepartmentId)); request.getMethod(),JSONObject.toJSONString(medicalDepartmentId));
List<ResponseRegistrationInformation> list=registrationInformationService.ShowRegistrationInformationNumber(medicalDepartmentId); List<SysDoctor> sysDoctorList=registrationInformationService.ShowRegistrationInformationNumber(medicalDepartmentId);
log.info("功能名称:查询不同科室医生诊金倒序信息,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(), log.info("功能名称:查询不同科室接待患者人数倒序医生信息,请求URI:{},请求方法:{},返回结果:{}",request.getRequestURI(),
request.getMethod(),JSONObject.toJSONString(list)); request.getMethod(),JSONObject.toJSONString(sysDoctorList));
return Result.success(list); return Result.success(sysDoctorList,"查询成功");
} }
@ -80,39 +81,45 @@ public class RegistrationInformationController {
* @return * @return
*/ */
@PostMapping("/ShowRegistrationInformationPraise") @PostMapping("/ShowRegistrationInformationPraise")
public Result<List<ResponseRegistrationInformation>> ShowRegistrationInformationPraise(Long medicalDepartmentId) { public Result<List<SysDoctor>> ShowRegistrationInformationPraise(@RequestParam Long medicalDepartmentId){
log.info("功能名称:查询不同科室好评人数倒序排序的医生信息,请求URI:{},请求方法:{},请求参数:{}", request.getRequestURI(), log.info("功能名称:查询不同科室好评人数倒序医生信息,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(),
request.getMethod(), JSONObject.toJSONString(medicalDepartmentId)); request.getMethod(),JSONObject.toJSONString(medicalDepartmentId));
List<ResponseRegistrationInformation> list = registrationInformationService.ShowRegistrationInformationPraise(medicalDepartmentId); List<SysDoctor> list=registrationInformationService.ShowRegistrationInformationPraise(medicalDepartmentId);
log.info("功能名称:查询不同科室好评人数倒序排序的医生信息,请求URI:{},请求方法:{},返回结果:{}", request.getRequestURI(), log.info("功能名称:查询不同科室好评人数倒序医生信息,请求URI:{},请求方法:{},返回结果:{}",request.getRequestURI(),
request.getMethod(), JSONObject.toJSONString(medicalDepartmentId)); request.getMethod(),JSONObject.toJSONString(list));
return Result.success(list); return Result.success(list,"查询成功");
} }
/**
* 查询不同科室综合排序医生信息
* @param medicalDepartmentId
* @return
*/
@PostMapping("/ShowRegistrationInformationAll") @PostMapping("/ShowRegistrationInformationAll")
public Result<List<ResponseRegistrationInformation>> ShowRegistrationInformationAll(Long medicalDepartmentId){ public Result<List<SysDoctor>> ShowRegistrationInformationAll(@RequestParam Long medicalDepartmentId){
log.info("功能名称:查询不同科室医生综合排序,请求URI:{},请求方法:{}",request.getRequestURI(), log.info("功能名称:查询不同科室综合排序医生信息,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(),
request.getMethod()); request.getMethod(),JSONObject.toJSONString(medicalDepartmentId));
List<ResponseRegistrationInformation> list=registrationInformationService.ShowRegistrationInformationAll(medicalDepartmentId); List<SysDoctor> list=registrationInformationService.ShowRegistrationInformationAll(medicalDepartmentId);
log.info("功能名称:查询不同科室医生综合排序,请求URI:{},请求方法:{},返回结果:{}",request.getRequestURI(), log.info("功能名称:查询不同科室综合排序医生信息,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(),
request.getMethod(),JSONObject.toJSONString(list)); request.getMethod(),JSONObject.toJSONString(list));
return Result.success(list); return Result.success(list,"查询成功");
} }
/** /**
* 查看医生详情 * 查看医生详情
* @param registrationInformationId * @param registrationInformationId
* @return * @return
*/ */
@PostMapping("/ShowRegistration") @PostMapping("/ShowRegistration")
public Result<List<ResponseRegistrationInformation>> ShowRegistration(Long registrationInformationId){ public Result<SysRegistrationInformation> ShowRegistration(@RequestParam Long registrationInformationId){
log.info("功能名称:查看医生详情,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(), log.info("功能名称:查询医生详情,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(),
request.getMethod(),JSONObject.toJSONString(registrationInformationId)); request.getMethod(),JSONObject.toJSONString(registrationInformationId));
List<ResponseRegistrationInformation> list=registrationInformationService.ShowRegistration(registrationInformationId); SysRegistrationInformation registrationInformation=registrationInformationService.ShowRegistration(registrationInformationId);
log.info("功能名称:查看医生详情,请求URI:{},请求方法:{},返回结果:{}",request.getRequestURI(), log.info("功能名称:查询医生详情,请求URI:{},请求方法:{},返回结果:{}",request.getRequestURI(),
request.getMethod(),JSONObject.toJSONString(list)); request.getMethod(),JSONObject.toJSONString(registrationInformation));
return Result.success(list); return Result.success(registrationInformation,"查询成功");
} }
} }

28
src/main/java/com/four/patient/feign/DoctorFeign.java
View File

@ -1,12 +1,15 @@
package com.four.patient.feign; package com.four.patient.feign;
import com.four.common.core.domain.R;
import com.four.common.core.web.domain.AjaxResult; import com.four.common.core.web.domain.AjaxResult;
import org.springframework.cloud.openfeign.FeignClient; import com.four.system.api.domain.SysDoctor;
import com.four.system.api.domain.SysUser;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import java.math.BigDecimal;
@FeignClient("four-system")
public interface DoctorFeign { public interface DoctorFeign {
/** /**
* 查询综合排序倒序医生信息 * 查询综合排序倒序医生信息
@ -52,7 +55,7 @@ public interface DoctorFeign {
* @return * @return
*/ */
@GetMapping("/user/findByUserId/{userId}") @GetMapping("/user/findByUserId/{userId}")
public AjaxResult findByUserId(@PathVariable(value = "userId") Long userId); public R<SysUser> findByUserId(@PathVariable(value = "userId") Long userId);
/** /**
@ -62,6 +65,25 @@ public interface DoctorFeign {
* @author 李闯 * @author 李闯
* @return * @return
*/ */
@GetMapping("/user/findRegistrationInfoUserId/{registrationInformationId}")
public R<SysDoctor> findRegistrationInfoUserId(@PathVariable("registrationInformationId") Long registrationInformationId);
/**
* 根据用户Id修改用户余额
* @param userId
* @param userMoney
* @author 李闯
* @return
*/
@PostMapping("/user/updateSysUserMoney/{userId}/{userMoney}")
public AjaxResult updateSysUserMoney(@PathVariable("userId") Long userId, @PathVariable("userMoney") BigDecimal userMoney);
/**
* 查询医生详情信息
* @param registrationInformationId
* @author 李闯
* @ruturn
*/
@GetMapping("/user/findRegistrationInformation/{registrationInformationId}")
public AjaxResult findRegistrationInformation(@PathVariable("registrationInformationId") Long registrationInformationId);
} }

8
src/main/java/com/four/patient/feign/SymptomsDrugsFeign.java → src/main/java/com/four/patient/feign/SymptomDrugsFeign.java
View File

@ -1,16 +1,16 @@
package com.four.patient.feign; package com.four.patient.feign;
import com.four.common.duck.Result; import com.four.common.duck.Result;
import com.four.common.duck.communitypatients.SymptomsDrugs; import com.four.common.duck.communitypatients.SymptomsDrugs;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import java.util.List; import java.util.List;
@FeignClient("dimensional-health-homePage") @FeignClient("dimensional-health-homePage")
public interface SymptomsDrugsFeign { public interface SymptomDrugsFeign {
/** /**
* 查询全部科室 * 查询所有科室
* @return * @return
*/ */
@GetMapping("/know/findSymptomDrugsAll") @GetMapping("/know/findSymptomDrugsAll")

34
src/main/java/com/four/patient/mapper/RegistrationInformationMapper.java
View File

@ -1,34 +0,0 @@
package com.four.patient.mapper;
import com.four.common.duck.communitypatients.SymptomsDrugs;
import com.four.common.duck.domain.GiftRecord;
import com.four.common.duck.gift.Gift;
import com.four.common.duck.interrogation.FollowDoctor;
import com.four.common.duck.interrogation.HistoricalConsultation;
import com.four.common.duck.interrogation.PatientEvaluator;
import com.four.common.duck.interrogation.RegistrationInformation;
import com.four.common.duck.my.User;
import com.four.common.duck.response.ResponseRegistrationInformation;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.util.List;
@Mapper
public interface RegistrationInformationMapper {
List<ResponseRegistrationInformation> ShowRegistrationInformationAllPrice(@Param("medicalDepartmentId") Long medicalDepartmentId);
List<ResponseRegistrationInformation> ShowRegistrationInformationNumber(@Param("medicalDepartmentId") Long medicalDepartmentId);
List<ResponseRegistrationInformation> ShowRegistrationInformationPraise(@Param("medicalDepartmentId") Long medicalDepartmentId);
List<ResponseRegistrationInformation> ShowRegistrationInformationAll(@Param("medicalDepartmentId") Long medicalDepartmentId);
List<ResponseRegistrationInformation> ShowRegistration(Long registrationInformationId);
}

26
src/main/java/com/four/patient/service/Impl/GiftServiceImpl.java
View File

@ -1,17 +1,18 @@
package com.four.patient.service.Impl; package com.four.patient.service.Impl;
import com.four.common.core.domain.R;
import com.four.common.duck.domain.GiftRecord; import com.four.common.duck.domain.GiftRecord;
import com.four.common.duck.gift.Gift; import com.four.common.duck.gift.Gift;
import com.four.common.duck.interrogation.RegistrationInformation;
import com.four.common.duck.my.User;
import com.four.common.security.utils.SecurityUtils; import com.four.common.security.utils.SecurityUtils;
import com.four.patient.feign.DoctorFeign;
import com.four.patient.mapper.GiftMapper; import com.four.patient.mapper.GiftMapper;
import com.four.patient.service.GiftService; import com.four.patient.service.GiftService;
import com.four.system.api.domain.SysDoctor;
import com.four.system.api.domain.SysUser;
import com.four.system.api.model.LoginUser; import com.four.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -21,6 +22,8 @@ public class GiftServiceImpl implements GiftService {
@Autowired @Autowired
private GiftMapper giftMapper; private GiftMapper giftMapper;
@Autowired
private DoctorFeign doctorFeign;
@Override @Override
public List<Gift> ShowGiftAll() { public List<Gift> ShowGiftAll() {
@ -40,18 +43,23 @@ public class GiftServiceImpl implements GiftService {
giftRecord.setGiverId(userid); giftRecord.setGiverId(userid);
giftRecord.setGiftGivingTime(new Date()); giftRecord.setGiftGivingTime(new Date());
//获取患者余额 //获取患者余额
double userMoney = loginUser.getSysUser().getUserMoney().doubleValue(); R<SysUser> sysUser = doctorFeign.findByUserId(userid);
SysUser userData = sysUser.getData();
double userMoney = userData.getUserMoney().doubleValue();
Gift gift=giftMapper.findByGiftId(giftRecord.getGiftId()); Gift gift=giftMapper.findByGiftId(giftRecord.getGiftId());
//获取礼物价格 //获取礼物价格
double giftPrice = gift.getGiftPrice().doubleValue(); double giftPrice = gift.getGiftPrice().doubleValue();
double patientMoney=(userMoney-giftPrice); BigDecimal patientMoney=BigDecimal.valueOf(userMoney-giftPrice);
giftMapper.updPatientMoney(patientMoney,userid); doctorFeign.updateSysUserMoney(userid,patientMoney);
//获取医生用户信息 //获取医生用户信息
RegistrationInformation registrationInformation =giftMapper.findByRegistration(giftRecord.getRegistrationInformationId()); R<SysDoctor> registrationInfoUser = doctorFeign.findRegistrationInfoUserId(giftRecord.getRegistrationInformationId());
//获取医生用户 //获取医生用户
User user=giftMapper.findByUserId(registrationInformation.getUserId()); SysDoctor sysDoctor = registrationInfoUser.getData();
R<SysUser> User = doctorFeign.findByUserId(sysDoctor.getUserId());
SysUser user = User.getData();
//修改医生金额
double doctorMoney = (user.getUserMoney().doubleValue() + giftPrice); double doctorMoney = (user.getUserMoney().doubleValue() + giftPrice);
giftMapper.updDoctorMoney(doctorMoney,user.getUserId()); doctorFeign.updateSysUserMoney(user.getUserId(),BigDecimal.valueOf(doctorMoney));
return i; return i;
} }
} }

24
src/main/java/com/four/patient/service/Impl/HistoricalConsultationServiceImpl.java
View File

@ -1,12 +1,16 @@
package com.four.patient.service.Impl; package com.four.patient.service.Impl;
import com.four.common.core.domain.R;
import com.four.common.duck.interrogation.HistoricalConsultation; import com.four.common.duck.interrogation.HistoricalConsultation;
import com.four.common.duck.interrogation.RegistrationInformation; import com.four.common.duck.interrogation.RegistrationInformation;
import com.four.common.duck.my.User; import com.four.common.duck.my.User;
import com.four.common.security.utils.SecurityUtils; import com.four.common.security.utils.SecurityUtils;
import com.four.patient.feign.DoctorFeign;
import com.four.patient.mapper.GiftMapper; import com.four.patient.mapper.GiftMapper;
import com.four.patient.mapper.HistoricalConsultationMapper; import com.four.patient.mapper.HistoricalConsultationMapper;
import com.four.patient.service.HistoricalConsultationService; import com.four.patient.service.HistoricalConsultationService;
import com.four.system.api.domain.SysDoctor;
import com.four.system.api.domain.SysUser;
import com.four.system.api.model.LoginUser; import com.four.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -20,9 +24,8 @@ public class HistoricalConsultationServiceImpl implements HistoricalConsultation
@Autowired @Autowired
private HistoricalConsultationMapper historicalConsultationMapper; private HistoricalConsultationMapper historicalConsultationMapper;
@Autowired @Autowired
private GiftMapper giftMapper; private DoctorFeign doctorFeign;
@Transactional @Transactional
@Override @Override
@ -34,21 +37,24 @@ public class HistoricalConsultationServiceImpl implements HistoricalConsultation
//获取患者id //获取患者id
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
historicalConsultation.setPatientId(loginUser.getUserid()); historicalConsultation.setPatientId(loginUser.getUserid());
historicalConsultation.setHistoricalConsultationStatus(2);
//获取患者金额 //获取患者金额
Double userMoney= loginUser.getSysUser().getUserMoney().doubleValue(); R<SysUser> sysUserR = doctorFeign.findByUserId(loginUser.getUserid());
SysUser sysUser = sysUserR.getData();
double userMoney = sysUser.getUserMoney().doubleValue();
//获取医生信息 //获取医生信息
RegistrationInformation registration = giftMapper.findByRegistration(historicalConsultation.getRegistrationInformationId()); R<SysDoctor> registrationInfoUserId = doctorFeign.findRegistrationInfoUserId(historicalConsultation.getRegistrationInformationId());
SysDoctor sysDoctor = registrationInfoUserId.getData();
//获取医生诊金 //获取医生诊金
double consultPrice = registration.getConsultingPrice().doubleValue(); double consultPrice = sysDoctor.getConsultingPrice().doubleValue();
//获取用户结清诊金后余额 //获取用户结清诊金后余额
double patientMoney=(userMoney-consultPrice); double patientMoney=(userMoney-consultPrice);
giftMapper.updPatientMoney(patientMoney,loginUser.getUserid()); doctorFeign.updateSysUserMoney(sysUser.getUserId(),BigDecimal.valueOf(patientMoney));
//获取医生的用户信息 //获取医生的用户信息
User user = giftMapper.findByUserId(registration.getUserId()); R<SysUser> byUserId = doctorFeign.findByUserId(sysDoctor.getUserId());
SysUser user = byUserId.getData();
//医生问诊后的余额 //医生问诊后的余额
Double doctorPrice=(user.getUserMoney().doubleValue() + consultPrice); Double doctorPrice=(user.getUserMoney().doubleValue() + consultPrice);
giftMapper.updDoctorMoney(doctorPrice,user.getUserId()); doctorFeign.updateSysUserMoney(user.getUserId(),BigDecimal.valueOf(doctorPrice));
return i; return i;
} }

61
src/main/java/com/four/patient/service/Impl/RegistrationInformationServiceImpl.java
View File

@ -1,67 +1,74 @@
package com.four.patient.service.Impl; package com.four.patient.service.Impl;
import com.alibaba.fastjson.JSONObject;
import com.four.common.core.web.domain.AjaxResult; import com.four.common.core.web.domain.AjaxResult;
import com.four.common.duck.Result; import com.four.common.duck.Result;
import com.four.common.duck.communitypatients.SymptomsDrugs; import com.four.common.duck.communitypatients.SymptomsDrugs;
import com.four.common.duck.response.ResponseRegistrationInformation;
import com.four.patient.feign.DoctorFeign; import com.four.patient.feign.DoctorFeign;
import com.four.patient.feign.SymptomsDrugsFeign; import com.four.patient.feign.SymptomDrugsFeign;
import com.four.patient.mapper.RegistrationInformationMapper;
import com.four.patient.service.RegistrationInformationService; import com.four.patient.service.RegistrationInformationService;
import com.four.system.api.domain.SysDoctor;
import com.four.system.api.domain.SysRegistrationInformation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@Service @Service
public class RegistrationInformationServiceImpl implements RegistrationInformationService { public class RegistrationInformationServiceImpl implements RegistrationInformationService {
@Autowired
private RegistrationInformationMapper registrationInformationMapper;
@Autowired
private SymptomsDrugsFeign symptomsDrugsFeign;
@Autowired @Autowired
private DoctorFeign doctorFeign; private DoctorFeign doctorFeign;
@Autowired
private SymptomDrugsFeign symptomDrugsFeign;
@Override @Override
public List<ResponseRegistrationInformation> ShowRegistrationInformationNumber(Long medicalDepartmentId) { public List<SysDoctor> ShowRegistrationInformationNumber(Long medicalDepartmentId) {
List<ResponseRegistrationInformation> list = registrationInformationMapper.ShowRegistrationInformationNumber(medicalDepartmentId); AjaxResult doctorPraise = doctorFeign.findDoctorPraise(medicalDepartmentId);
return list; Object o = doctorPraise.get("sysList");
List<SysDoctor> sysDoctorList = Collections.singletonList(JSONObject.parseObject(o.toString(), SysDoctor.class));
return sysDoctorList;
} }
@Override @Override
public List<ResponseRegistrationInformation> ShowRegistrationInformationPraise(Long medicalDepartmentId) { public List<SysDoctor> ShowRegistrationInformationPraise(Long medicalDepartmentId) {
List<ResponseRegistrationInformation> list = registrationInformationMapper.ShowRegistrationInformationPraise(medicalDepartmentId); AjaxResult doctorNumber = doctorFeign.findDoctorNumber(medicalDepartmentId);
return list; Object o = doctorNumber.get("sysUser");
List<SysDoctor> sysDoctorList = Collections.singletonList(JSONObject.parseObject(o.toString(), SysDoctor.class));
return sysDoctorList;
} }
@Override @Override
public List<ResponseRegistrationInformation> ShowRegistrationInformationAll(Long medicalDepartmentId) { public List<SysDoctor> ShowRegistrationInformationAll(Long medicalDepartmentId) {
List<ResponseRegistrationInformation> list=registrationInformationMapper.ShowRegistrationInformationAll(medicalDepartmentId); AjaxResult doctorComprehensive = doctorFeign.findDoctorComprehensive(medicalDepartmentId);
return list; Object o = doctorComprehensive.get("sysDoctorList");
List<SysDoctor> sysDoctorList = Collections.singletonList(JSONObject.parseObject(o.toString(), SysDoctor.class));
return sysDoctorList;
} }
@Override @Override
public List<SymptomsDrugs> ShowSymptomsDrug() { public List<SymptomsDrugs> ShowSymptomsDrug() {
Result<List<SymptomsDrugs>> symptomDrugsAll = symptomsDrugsFeign.findSymptomDrugsAll(); Result<List<SymptomsDrugs>> symptomDrugsAll = symptomDrugsFeign.findSymptomDrugsAll();
List<SymptomsDrugs> symptomsDrugsList = symptomDrugsAll.getData(); List<SymptomsDrugs> symptomsDrugsList=symptomDrugsAll.getData();
return symptomsDrugsList; return symptomsDrugsList;
} }
@Override @Override
public List<ResponseRegistrationInformation> ShowRegistration(Long registrationInformationId) { public SysRegistrationInformation ShowRegistration(Long registrationInformationId) {
List<ResponseRegistrationInformation> informationList=registrationInformationMapper.ShowRegistration(registrationInformationId); AjaxResult registrationInformation = doctorFeign.findRegistrationInformation(registrationInformationId);
return informationList; Object o = registrationInformation.get("registrationInformation");
SysRegistrationInformation sysRegistrationInformation = JSONObject.parseObject(o.toString(), SysRegistrationInformation.class);
return sysRegistrationInformation;
} }
@Override @Override
public List<ResponseRegistrationInformation> ShowRegistrationInformationAllPrice(Long medicalDepartmentId) { public List<SysDoctor> ShowRegistrationInformationAllPrice(Long medicalDepartmentId) {
AjaxResult ajaxResult = doctorFeign.findDoctorInformation(medicalDepartmentId); AjaxResult ajaxResult = doctorFeign.findDoctorInformation(medicalDepartmentId);
List<ResponseRegistrationInformation> sysRedis = (List<ResponseRegistrationInformation>) ajaxResult.get("SysRedis"); Object sysRedis = ajaxResult.get("sysRedis");
return sysRedis; List<SysDoctor> sysDoctorList = Collections.singletonList(JSONObject.parseObject(sysRedis.toString(), SysDoctor.class));
return sysDoctorList;
} }

11
src/main/java/com/four/patient/service/Impl/RemoteServiceImpl.java
View File

@ -1,11 +0,0 @@
package com.four.patient.service.Impl;
public class RemoteServiceImpl implements RemoteService {
@Override
public String sayHello(String username) {
return "Hello,"+username+"!";
}
}

14
src/main/java/com/four/patient/service/RegistrationInformationService.java
View File

@ -1,7 +1,8 @@
package com.four.patient.service; package com.four.patient.service;
import com.four.common.duck.communitypatients.SymptomsDrugs; import com.four.common.duck.communitypatients.SymptomsDrugs;
import com.four.common.duck.response.ResponseRegistrationInformation; import com.four.system.api.domain.SysDoctor;
import com.four.system.api.domain.SysRegistrationInformation;
import java.util.List; import java.util.List;
@ -10,17 +11,18 @@ public interface RegistrationInformationService {
List<ResponseRegistrationInformation> ShowRegistrationInformationNumber(Long medicalDepartmentId); List<SysDoctor> ShowRegistrationInformationNumber(Long medicalDepartmentId);
List<ResponseRegistrationInformation> ShowRegistrationInformationPraise(Long medicalDepartmentId); List<SysDoctor> ShowRegistrationInformationPraise(Long medicalDepartmentId);
List<ResponseRegistrationInformation> ShowRegistrationInformationAll(Long medicalDepartmentId); List<SysDoctor> ShowRegistrationInformationAll(Long medicalDepartmentId);
List<SymptomsDrugs> ShowSymptomsDrug(); List<SymptomsDrugs> ShowSymptomsDrug();
List<ResponseRegistrationInformation> ShowRegistration(Long registrationInformationId);
List<ResponseRegistrationInformation> ShowRegistrationInformationAllPrice(Long medicalDepartmentId); List<SysDoctor> ShowRegistrationInformationAllPrice(Long medicalDepartmentId);
SysRegistrationInformation ShowRegistration(Long registrationInformationId);
} }

107
src/main/resources/mapper/RegistrationInformationMapper.xml
View File

@ -1,107 +0,0 @@
<?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="com.four.patient.mapper.RegistrationInformationMapper">
<resultMap id="ResponseRegistrationInformation" type="com.four.common.duck.response.ResponseRegistrationInformation">
<id property="registrationInformationId" column="registration_information_id"/>
<result property="userId" column="user_id"/>
<result property="realName" column="real_name"/>
<result property="affiliatedHospital" column="affiliated_hospital"/>
<result property="medicalDepartmentId" column="medical_department_id"/>
<result property="professionalTitleDoctorId" column="professional_title_doctor_id"/>
<result property="personalResume" column="personal_resume"/>
<result property="areaExpertise" column="area_expertise"/>
<result property="registrationTime" column="registration_time"/>
<result property="numberPatientsServed" column="number_patients_served"/>
<result property="consultingPrice" column="consulting_price"/>
<result property="praise" column="praise"/>
<result property="registrationInformationExamineStatus" column="registration_information_examine_status"/>
<result property="registrationInformationMedicStatus" column="registration_information_medic_status"/>
<result property="name" column="name"/>
<result property="professionalTitleDoctorName" column="professional_title_doctor_name"/>
<result property="username" column="username"/>
</resultMap>
<sql id="selectRegistrationInformation">
SELECT r.registration_information_id,
r.user_id,r.real_name,
r.affiliated_hospital,
r.medical_department_id,
r.professional_title_doctor_id,
r.personal_resume,
r.area_expertise,
r.registration_time,
r.number_patients_served,
r.consulting_price,
r.praise,
r.registration_information_examine_status,
r.registration_information_medic_status,
s.`name`, p.professional_title_doctor_name
FROM `registration_information` r
LEFT JOIN symptoms_drugs s ON r.medical_department_id = s.id
LEFT JOIN professional_title_doctor p
ON r.professional_title_doctor_id = p.professional_title_doctor_id
</sql>
<select id="ShowRegistrationInformationAllPrice" resultMap="ResponseRegistrationInformation">
<include refid="selectRegistrationInformation"></include>
<where>
<if test="null!=medicalDepartmentId and ''!=medicalDepartmentId">
and r.medical_department_id = #{medicalDepartmentId}
</if>
</where>
ORDER BY r.consulting_price DESC
</select>
<select id="ShowRegistrationInformationNumber" resultMap="ResponseRegistrationInformation">
<include refid="selectRegistrationInformation"></include>
<where>
<if test="null!=medicalDepartmentId and ''!=medicalDepartmentId">
and r.medical_department_id = #{medicalDepartmentId}
</if>
</where>
ORDER BY r.number_patients_served DESC
</select>
<select id="ShowRegistrationInformationPraise" resultMap="ResponseRegistrationInformation">
<include refid="selectRegistrationInformation"></include>
<where>
<if test="null!=medicalDepartmentId and ''!=medicalDepartmentId">
and r.medical_department_id = #{medicalDepartmentId}
</if>
</where>
ORDER BY r.praise DESC
</select>
<select id="ShowRegistrationInformationAll" resultMap="ResponseRegistrationInformation">
<include refid="selectRegistrationInformation"></include>
<where>
<if test="null!=medicalDepartmentId and ''!=medicalDepartmentId">
and r.medical_department_id=#{medicalDepartmentId}
</if>
</where>
ORDER BY r.consulting_price,r.number_patients_served,r.praise DESC
</select>
<select id="ShowRegistration" resultMap="ResponseRegistrationInformation">
select registration_information_id,
user_id,
real_name,
affiliated_hospital,
medical_department_id,
professional_title_doctor_id,
personal_resume,
area_expertise,
registration_time,
number_patients_served,
consulting_price,
praise,
registration_information_examine_status,
registration_information_medic_status
from registration_information
<where>
<if test="null!=registrationInformationId and ''!=registrationInformationId">
and registration_information_id=#{registrationInformationId}
</if>
</where>
</select>
</mapper>