diff --git a/pom.xml b/pom.xml index 01addcb..3d0c192 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 dimensional-health-interrogation - 1.0-SNAPSHOT + 3.6.3 17 @@ -17,7 +17,6 @@ com.four four-dimensional-health 3.6.3 - @@ -86,6 +85,12 @@ 2.4 jdk15 + + com.four + four-modules-system + 3.6.4 + + com.easemob.im im-sdk-core @@ -112,4 +117,36 @@ spring-boot-starter-web-services + + + menghang-public + menghang-public + http://47.120.41.128:8081/repository/maven-public/ + + + + + + menghang-releases + menghang-releases + http://47.120.41.128:8081/repository/maven-releases/ + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + diff --git a/src/main/java/com/four/patient/controller/FollowDoctorController.java b/src/main/java/com/four/patient/controller/FollowDoctorController.java index 26c5fa3..ed7d965 100644 --- a/src/main/java/com/four/patient/controller/FollowDoctorController.java +++ b/src/main/java/com/four/patient/controller/FollowDoctorController.java @@ -51,16 +51,6 @@ public class FollowDoctorController { 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 diff --git a/src/main/java/com/four/patient/controller/HistoricalConsultationController.java b/src/main/java/com/four/patient/controller/HistoricalConsultationController.java index 0c5bc42..27561f0 100644 --- a/src/main/java/com/four/patient/controller/HistoricalConsultationController.java +++ b/src/main/java/com/four/patient/controller/HistoricalConsultationController.java @@ -24,16 +24,16 @@ public class HistoricalConsultationController { private HttpServletRequest request; /** - * 结束问诊时添加问诊记录并付问诊金额 + *问诊时添加问诊记录并付问诊金额 * @param historicalConsultation * @return */ @PostMapping("/insertHistoricalConsultation") public Result insertHistoricalConsultation(@RequestBody HistoricalConsultation historicalConsultation){ - log.info("功能名称:结束问诊后生成历史记录并结算诊金,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(), + log.info("功能名称:问诊生成历史记录并结算诊金,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(), request.getMethod(), JSONObject.toJSONString(historicalConsultation)); Integer i=historicalConsultationService.insertHistoricalConsultation(historicalConsultation); - log.info("功能名称:结束问诊后生成历史记录并结算诊金,请求URI:{},请求方法:{},返回结果:{}",request.getRequestURI(), + log.info("功能名称:问诊生成历史记录并结算诊金,请求URI:{},请求方法:{},返回结果:{}",request.getRequestURI(), request.getMethod(),JSONObject.toJSONString(i)); return Result.success(i,"历史记录添加成功"); } diff --git a/src/main/java/com/four/patient/controller/RegistrationInformationController.java b/src/main/java/com/four/patient/controller/RegistrationInformationController.java index e340dff..abd5797 100644 --- a/src/main/java/com/four/patient/controller/RegistrationInformationController.java +++ b/src/main/java/com/four/patient/controller/RegistrationInformationController.java @@ -6,6 +6,8 @@ import com.four.common.core.domain.Result; import com.four.common.duck.communitypatients.SymptomsDrugs; import com.four.common.duck.response.ResponseRegistrationInformation; 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -47,13 +49,13 @@ public class RegistrationInformationController { * @return */ @PostMapping("/ShowRegistrationInformationAllPrice") - public Result> ShowRegistrationInformationAllPrice(@RequestParam Long medicalDepartmentId){ + public Result> ShowRegistrationInformationAllPrice(@RequestParam Long medicalDepartmentId){ log.info("功能名称:查询价格倒序的医生信息,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(), request.getMethod(),JSONObject.toJSONString(medicalDepartmentId)); - List list=registrationInformationService.ShowRegistrationInformationAllPrice(medicalDepartmentId); - log.info("功能名称:查询价格倒序到医生信息,请求URI:{},请求方法:{},返回结果:{}",request.getRequestURI(), + List list=registrationInformationService.ShowRegistrationInformationAllPrice(medicalDepartmentId); + log.info("功能名称:查询价格倒序的医生信息,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(), request.getMethod(),JSONObject.toJSONString(list)); - return Result.success(list); + return Result.success(list,"查询成功"); } @@ -63,14 +65,13 @@ public class RegistrationInformationController { * @return */ @PostMapping("/ShowRegistrationInformationNumber") - public Result> ShowRegistrationInformationNumber(@RequestParam Long medicalDepartmentId){ - log.info("功能名称:查询不同科室医生诊金倒序信息,请求URI:{}。请求方法:{},请求参数:{}",request.getRequestURI(), + public Result> ShowRegistrationInformationNumber(@RequestParam Long medicalDepartmentId){ + log.info("功能名称:查询不同科室接待患者人数倒序医生信息,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(), request.getMethod(),JSONObject.toJSONString(medicalDepartmentId)); - List list=registrationInformationService.ShowRegistrationInformationNumber(medicalDepartmentId); - log.info("功能名称:查询不同科室医生诊金倒序信息,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(), - request.getMethod(),JSONObject.toJSONString(list)); - return Result.success(list); - + List sysDoctorList=registrationInformationService.ShowRegistrationInformationNumber(medicalDepartmentId); + log.info("功能名称:查询不同科室接待患者人数倒序医生信息,请求URI:{},请求方法:{},返回结果:{}",request.getRequestURI(), + request.getMethod(),JSONObject.toJSONString(sysDoctorList)); + return Result.success(sysDoctorList,"查询成功"); } @@ -80,39 +81,45 @@ public class RegistrationInformationController { * @return */ @PostMapping("/ShowRegistrationInformationPraise") - public Result> ShowRegistrationInformationPraise(Long medicalDepartmentId) { - log.info("功能名称:查询不同科室好评人数倒序排序的医生信息,请求URI:{},请求方法:{},请求参数:{}", request.getRequestURI(), - request.getMethod(), JSONObject.toJSONString(medicalDepartmentId)); - List list = registrationInformationService.ShowRegistrationInformationPraise(medicalDepartmentId); - log.info("功能名称:查询不同科室好评人数倒序排序的医生信息,请求URI:{},请求方法:{},返回结果:{}", request.getRequestURI(), - request.getMethod(), JSONObject.toJSONString(medicalDepartmentId)); - return Result.success(list); + public Result> ShowRegistrationInformationPraise(@RequestParam Long medicalDepartmentId){ + log.info("功能名称:查询不同科室好评人数倒序医生信息,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(), + request.getMethod(),JSONObject.toJSONString(medicalDepartmentId)); + List list=registrationInformationService.ShowRegistrationInformationPraise(medicalDepartmentId); + log.info("功能名称:查询不同科室好评人数倒序医生信息,请求URI:{},请求方法:{},返回结果:{}",request.getRequestURI(), + request.getMethod(),JSONObject.toJSONString(list)); + return Result.success(list,"查询成功"); } + + /** + * 查询不同科室综合排序医生信息 + * @param medicalDepartmentId + * @return + */ @PostMapping("/ShowRegistrationInformationAll") - public Result> ShowRegistrationInformationAll(Long medicalDepartmentId){ - log.info("功能名称:查询不同科室医生综合排序,请求URI:{},请求方法:{}",request.getRequestURI(), - request.getMethod()); - List list=registrationInformationService.ShowRegistrationInformationAll(medicalDepartmentId); - log.info("功能名称:查询不同科室医生综合排序,请求URI:{},请求方法:{},返回结果:{}",request.getRequestURI(), + public Result> ShowRegistrationInformationAll(@RequestParam Long medicalDepartmentId){ + log.info("功能名称:查询不同科室综合排序医生信息,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(), + request.getMethod(),JSONObject.toJSONString(medicalDepartmentId)); + List list=registrationInformationService.ShowRegistrationInformationAll(medicalDepartmentId); + log.info("功能名称:查询不同科室综合排序医生信息,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(), request.getMethod(),JSONObject.toJSONString(list)); - return Result.success(list); + return Result.success(list,"查询成功"); } + + /** * 查看医生详情 * @param registrationInformationId * @return */ @PostMapping("/ShowRegistration") - public Result> ShowRegistration(Long registrationInformationId){ - log.info("功能名称:查看医生详情,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(), + public Result ShowRegistration(@RequestParam Long registrationInformationId){ + log.info("功能名称:查询医生详情,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(), request.getMethod(),JSONObject.toJSONString(registrationInformationId)); - List list=registrationInformationService.ShowRegistration(registrationInformationId); - log.info("功能名称:查看医生详情,请求URI:{},请求方法:{},返回结果:{}",request.getRequestURI(), - request.getMethod(),JSONObject.toJSONString(list)); - return Result.success(list); + SysRegistrationInformation registrationInformation=registrationInformationService.ShowRegistration(registrationInformationId); + log.info("功能名称:查询医生详情,请求URI:{},请求方法:{},返回结果:{}",request.getRequestURI(), + request.getMethod(),JSONObject.toJSONString(registrationInformation)); + return Result.success(registrationInformation,"查询成功"); } - - } diff --git a/src/main/java/com/four/patient/feign/DoctorFeign.java b/src/main/java/com/four/patient/feign/DoctorFeign.java index bb1fd62..415ac8e 100644 --- a/src/main/java/com/four/patient/feign/DoctorFeign.java +++ b/src/main/java/com/four/patient/feign/DoctorFeign.java @@ -1,12 +1,15 @@ package com.four.patient.feign; +import com.four.common.core.domain.R; 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.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import java.math.BigDecimal; + -@FeignClient("four-system") public interface DoctorFeign { /** * 查询综合排序倒序医生信息 @@ -52,7 +55,7 @@ public interface DoctorFeign { * @return */ @GetMapping("/user/findByUserId/{userId}") - public AjaxResult findByUserId(@PathVariable(value = "userId") Long userId); + public R findByUserId(@PathVariable(value = "userId") Long userId); /** @@ -62,6 +65,25 @@ public interface DoctorFeign { * @author 李闯 * @return */ + @GetMapping("/user/findRegistrationInfoUserId/{registrationInformationId}") + public R 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); } diff --git a/src/main/java/com/four/patient/feign/SymptomsDrugsFeign.java b/src/main/java/com/four/patient/feign/SymptomDrugsFeign.java similarity index 87% rename from src/main/java/com/four/patient/feign/SymptomsDrugsFeign.java rename to src/main/java/com/four/patient/feign/SymptomDrugsFeign.java index 61f98f5..f4fa74d 100644 --- a/src/main/java/com/four/patient/feign/SymptomsDrugsFeign.java +++ b/src/main/java/com/four/patient/feign/SymptomDrugsFeign.java @@ -1,16 +1,16 @@ package com.four.patient.feign; - import com.four.common.duck.Result; import com.four.common.duck.communitypatients.SymptomsDrugs; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; - import java.util.List; + @FeignClient("dimensional-health-homePage") -public interface SymptomsDrugsFeign { +public interface SymptomDrugsFeign { + /** - * 查询全部科室 + * 查询所有科室 * @return */ @GetMapping("/know/findSymptomDrugsAll") diff --git a/src/main/java/com/four/patient/mapper/RegistrationInformationMapper.java b/src/main/java/com/four/patient/mapper/RegistrationInformationMapper.java deleted file mode 100644 index 80441b7..0000000 --- a/src/main/java/com/four/patient/mapper/RegistrationInformationMapper.java +++ /dev/null @@ -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 ShowRegistrationInformationAllPrice(@Param("medicalDepartmentId") Long medicalDepartmentId); - - List ShowRegistrationInformationNumber(@Param("medicalDepartmentId") Long medicalDepartmentId); - - List ShowRegistrationInformationPraise(@Param("medicalDepartmentId") Long medicalDepartmentId); - - - List ShowRegistrationInformationAll(@Param("medicalDepartmentId") Long medicalDepartmentId); - - List ShowRegistration(Long registrationInformationId); -} diff --git a/src/main/java/com/four/patient/service/Impl/GiftServiceImpl.java b/src/main/java/com/four/patient/service/Impl/GiftServiceImpl.java index 01840fb..61dc59e 100644 --- a/src/main/java/com/four/patient/service/Impl/GiftServiceImpl.java +++ b/src/main/java/com/four/patient/service/Impl/GiftServiceImpl.java @@ -1,17 +1,18 @@ 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.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.patient.feign.DoctorFeign; import com.four.patient.mapper.GiftMapper; 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -21,6 +22,8 @@ public class GiftServiceImpl implements GiftService { @Autowired private GiftMapper giftMapper; + @Autowired + private DoctorFeign doctorFeign; @Override public List ShowGiftAll() { @@ -40,18 +43,23 @@ public class GiftServiceImpl implements GiftService { giftRecord.setGiverId(userid); giftRecord.setGiftGivingTime(new Date()); //获取患者余额 - double userMoney = loginUser.getSysUser().getUserMoney().doubleValue(); + R sysUser = doctorFeign.findByUserId(userid); + SysUser userData = sysUser.getData(); + double userMoney = userData.getUserMoney().doubleValue(); Gift gift=giftMapper.findByGiftId(giftRecord.getGiftId()); //获取礼物价格 double giftPrice = gift.getGiftPrice().doubleValue(); - double patientMoney=(userMoney-giftPrice); - giftMapper.updPatientMoney(patientMoney,userid); + BigDecimal patientMoney=BigDecimal.valueOf(userMoney-giftPrice); + doctorFeign.updateSysUserMoney(userid,patientMoney); //获取医生用户信息 - RegistrationInformation registrationInformation =giftMapper.findByRegistration(giftRecord.getRegistrationInformationId()); + R registrationInfoUser = doctorFeign.findRegistrationInfoUserId(giftRecord.getRegistrationInformationId()); //获取医生用户 - User user=giftMapper.findByUserId(registrationInformation.getUserId()); + SysDoctor sysDoctor = registrationInfoUser.getData(); + R User = doctorFeign.findByUserId(sysDoctor.getUserId()); + SysUser user = User.getData(); + //修改医生金额 double doctorMoney = (user.getUserMoney().doubleValue() + giftPrice); - giftMapper.updDoctorMoney(doctorMoney,user.getUserId()); + doctorFeign.updateSysUserMoney(user.getUserId(),BigDecimal.valueOf(doctorMoney)); return i; } } diff --git a/src/main/java/com/four/patient/service/Impl/HistoricalConsultationServiceImpl.java b/src/main/java/com/four/patient/service/Impl/HistoricalConsultationServiceImpl.java index db3e7eb..f14788e 100644 --- a/src/main/java/com/four/patient/service/Impl/HistoricalConsultationServiceImpl.java +++ b/src/main/java/com/four/patient/service/Impl/HistoricalConsultationServiceImpl.java @@ -1,12 +1,16 @@ 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.RegistrationInformation; import com.four.common.duck.my.User; import com.four.common.security.utils.SecurityUtils; +import com.four.patient.feign.DoctorFeign; import com.four.patient.mapper.GiftMapper; import com.four.patient.mapper.HistoricalConsultationMapper; 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,9 +24,8 @@ public class HistoricalConsultationServiceImpl implements HistoricalConsultation @Autowired private HistoricalConsultationMapper historicalConsultationMapper; - @Autowired - private GiftMapper giftMapper; + private DoctorFeign doctorFeign; @Transactional @Override @@ -34,21 +37,24 @@ public class HistoricalConsultationServiceImpl implements HistoricalConsultation //获取患者id LoginUser loginUser = SecurityUtils.getLoginUser(); historicalConsultation.setPatientId(loginUser.getUserid()); - historicalConsultation.setHistoricalConsultationStatus(2); //获取患者金额 - Double userMoney= loginUser.getSysUser().getUserMoney().doubleValue(); + R sysUserR = doctorFeign.findByUserId(loginUser.getUserid()); + SysUser sysUser = sysUserR.getData(); + double userMoney = sysUser.getUserMoney().doubleValue(); //获取医生信息 - RegistrationInformation registration = giftMapper.findByRegistration(historicalConsultation.getRegistrationInformationId()); + R registrationInfoUserId = doctorFeign.findRegistrationInfoUserId(historicalConsultation.getRegistrationInformationId()); + SysDoctor sysDoctor = registrationInfoUserId.getData(); //获取医生诊金 - double consultPrice = registration.getConsultingPrice().doubleValue(); + double consultPrice = sysDoctor.getConsultingPrice().doubleValue(); //获取用户结清诊金后余额 double patientMoney=(userMoney-consultPrice); - giftMapper.updPatientMoney(patientMoney,loginUser.getUserid()); + doctorFeign.updateSysUserMoney(sysUser.getUserId(),BigDecimal.valueOf(patientMoney)); //获取医生的用户信息 - User user = giftMapper.findByUserId(registration.getUserId()); + R byUserId = doctorFeign.findByUserId(sysDoctor.getUserId()); + SysUser user = byUserId.getData(); //医生问诊后的余额 Double doctorPrice=(user.getUserMoney().doubleValue() + consultPrice); - giftMapper.updDoctorMoney(doctorPrice,user.getUserId()); + doctorFeign.updateSysUserMoney(user.getUserId(),BigDecimal.valueOf(doctorPrice)); return i; } diff --git a/src/main/java/com/four/patient/service/Impl/RegistrationInformationServiceImpl.java b/src/main/java/com/four/patient/service/Impl/RegistrationInformationServiceImpl.java index 8fdc2d1..619e2ef 100644 --- a/src/main/java/com/four/patient/service/Impl/RegistrationInformationServiceImpl.java +++ b/src/main/java/com/four/patient/service/Impl/RegistrationInformationServiceImpl.java @@ -1,67 +1,74 @@ package com.four.patient.service.Impl; +import com.alibaba.fastjson.JSONObject; import com.four.common.core.web.domain.AjaxResult; import com.four.common.duck.Result; 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.SymptomsDrugsFeign; -import com.four.patient.mapper.RegistrationInformationMapper; +import com.four.patient.feign.SymptomDrugsFeign; 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.stereotype.Service; - -import java.util.ArrayList; +import java.util.Collections; import java.util.List; @Service public class RegistrationInformationServiceImpl implements RegistrationInformationService { - @Autowired - private RegistrationInformationMapper registrationInformationMapper; - - @Autowired - private SymptomsDrugsFeign symptomsDrugsFeign; @Autowired private DoctorFeign doctorFeign; + @Autowired + private SymptomDrugsFeign symptomDrugsFeign; + @Override - public List ShowRegistrationInformationNumber(Long medicalDepartmentId) { - List list = registrationInformationMapper.ShowRegistrationInformationNumber(medicalDepartmentId); - return list; + public List ShowRegistrationInformationNumber(Long medicalDepartmentId) { + AjaxResult doctorPraise = doctorFeign.findDoctorPraise(medicalDepartmentId); + Object o = doctorPraise.get("sysList"); + List sysDoctorList = Collections.singletonList(JSONObject.parseObject(o.toString(), SysDoctor.class)); + return sysDoctorList; } @Override - public List ShowRegistrationInformationPraise(Long medicalDepartmentId) { - List list = registrationInformationMapper.ShowRegistrationInformationPraise(medicalDepartmentId); - return list; + public List ShowRegistrationInformationPraise(Long medicalDepartmentId) { + AjaxResult doctorNumber = doctorFeign.findDoctorNumber(medicalDepartmentId); + Object o = doctorNumber.get("sysUser"); + List sysDoctorList = Collections.singletonList(JSONObject.parseObject(o.toString(), SysDoctor.class)); + return sysDoctorList; } @Override - public List ShowRegistrationInformationAll(Long medicalDepartmentId) { - List list=registrationInformationMapper.ShowRegistrationInformationAll(medicalDepartmentId); - return list; + public List ShowRegistrationInformationAll(Long medicalDepartmentId) { + AjaxResult doctorComprehensive = doctorFeign.findDoctorComprehensive(medicalDepartmentId); + Object o = doctorComprehensive.get("sysDoctorList"); + List sysDoctorList = Collections.singletonList(JSONObject.parseObject(o.toString(), SysDoctor.class)); + return sysDoctorList; } @Override public List ShowSymptomsDrug() { - Result> symptomDrugsAll = symptomsDrugsFeign.findSymptomDrugsAll(); - List symptomsDrugsList = symptomDrugsAll.getData(); + Result> symptomDrugsAll = symptomDrugsFeign.findSymptomDrugsAll(); + List symptomsDrugsList=symptomDrugsAll.getData(); return symptomsDrugsList; } @Override - public List ShowRegistration(Long registrationInformationId) { - List informationList=registrationInformationMapper.ShowRegistration(registrationInformationId); - return informationList; + public SysRegistrationInformation ShowRegistration(Long registrationInformationId) { + AjaxResult registrationInformation = doctorFeign.findRegistrationInformation(registrationInformationId); + Object o = registrationInformation.get("registrationInformation"); + SysRegistrationInformation sysRegistrationInformation = JSONObject.parseObject(o.toString(), SysRegistrationInformation.class); + return sysRegistrationInformation; } @Override - public List ShowRegistrationInformationAllPrice(Long medicalDepartmentId) { + public List ShowRegistrationInformationAllPrice(Long medicalDepartmentId) { AjaxResult ajaxResult = doctorFeign.findDoctorInformation(medicalDepartmentId); - List sysRedis = (List) ajaxResult.get("SysRedis"); - return sysRedis; + Object sysRedis = ajaxResult.get("sysRedis"); + List sysDoctorList = Collections.singletonList(JSONObject.parseObject(sysRedis.toString(), SysDoctor.class)); + return sysDoctorList; } diff --git a/src/main/java/com/four/patient/service/Impl/RemoteServiceImpl.java b/src/main/java/com/four/patient/service/Impl/RemoteServiceImpl.java deleted file mode 100644 index 2d83a2a..0000000 --- a/src/main/java/com/four/patient/service/Impl/RemoteServiceImpl.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.four.patient.service.Impl; - - -public class RemoteServiceImpl implements RemoteService { - - - @Override - public String sayHello(String username) { - return "Hello,"+username+"!"; - } -} diff --git a/src/main/java/com/four/patient/service/RegistrationInformationService.java b/src/main/java/com/four/patient/service/RegistrationInformationService.java index 3cf7222..e2fa311 100644 --- a/src/main/java/com/four/patient/service/RegistrationInformationService.java +++ b/src/main/java/com/four/patient/service/RegistrationInformationService.java @@ -1,7 +1,8 @@ package com.four.patient.service; 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; @@ -10,17 +11,18 @@ public interface RegistrationInformationService { - List ShowRegistrationInformationNumber(Long medicalDepartmentId); + List ShowRegistrationInformationNumber(Long medicalDepartmentId); - List ShowRegistrationInformationPraise(Long medicalDepartmentId); + List ShowRegistrationInformationPraise(Long medicalDepartmentId); - List ShowRegistrationInformationAll(Long medicalDepartmentId); + List ShowRegistrationInformationAll(Long medicalDepartmentId); List ShowSymptomsDrug(); - List ShowRegistration(Long registrationInformationId); - List ShowRegistrationInformationAllPrice(Long medicalDepartmentId); + List ShowRegistrationInformationAllPrice(Long medicalDepartmentId); + SysRegistrationInformation ShowRegistration(Long registrationInformationId); + } diff --git a/src/main/resources/mapper/RegistrationInformationMapper.xml b/src/main/resources/mapper/RegistrationInformationMapper.xml deleted file mode 100644 index 6b175e7..0000000 --- a/src/main/resources/mapper/RegistrationInformationMapper.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - -