diff --git a/src/main/java/com/four/InterrogationApp.java b/src/main/java/com/four/InterrogationApp.java index 51b8df5..7829637 100644 --- a/src/main/java/com/four/InterrogationApp.java +++ b/src/main/java/com/four/InterrogationApp.java @@ -2,8 +2,10 @@ package com.four; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; @SpringBootApplication +@EnableFeignClients public class InterrogationApp { public static void main(String[] args) { SpringApplication.run(InterrogationApp.class); diff --git a/src/main/java/com/four/patient/controller/RegistrationInformationController.java b/src/main/java/com/four/patient/controller/RegistrationInformationController.java index d42e421..6452617 100644 --- a/src/main/java/com/four/patient/controller/RegistrationInformationController.java +++ b/src/main/java/com/four/patient/controller/RegistrationInformationController.java @@ -32,16 +32,16 @@ public class RegistrationInformationController { private HttpServletRequest request; /** - * 查询到所有科室 + * 查询全部科室 * @return */ - @GetMapping("/ShowDepartmentAll") - public Result> ShowDepartmentAll() { - log.info("功能名称:查询所有科室,请求URI:{},请求方法:{}", request.getRequestURI(), + @GetMapping("/ShowSymptomsDrug") + public Result> ShowSymptomsDrug(){ + log.info("功能名称:查询全部科室,请求URI:{},请求方法:{}",request.getRequestURI(), request.getMethod()); - List list = registrationInformationService.ShowDepartmentAll(); - log.info("功能名称:查询所有科室,请求URI:{},请求方法:{},返回结果:{}", request.getRequestURI(), - request.getMethod(), JSONObject.toJSONString(list)); + List list=registrationInformationService.ShowSymptomsDrug(); + log.info("功能名称:查询全部科室,请求URI:{},请求方法:{},返回结果:{}",request.getRequestURI(), + request.getMethod(),JSONObject.toJSONString(list)); return Result.success(list); } diff --git a/src/main/java/com/four/patient/feign/SymptomsDrugsFeign.java b/src/main/java/com/four/patient/feign/SymptomsDrugsFeign.java new file mode 100644 index 0000000..61f98f5 --- /dev/null +++ b/src/main/java/com/four/patient/feign/SymptomsDrugsFeign.java @@ -0,0 +1,18 @@ +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 { + /** + * 查询全部科室 + * @return + */ + @GetMapping("/know/findSymptomDrugsAll") + public Result> findSymptomDrugsAll(); +} 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 ae70ad8..5f28411 100644 --- a/src/main/java/com/four/patient/service/Impl/RegistrationInformationServiceImpl.java +++ b/src/main/java/com/four/patient/service/Impl/RegistrationInformationServiceImpl.java @@ -1,7 +1,9 @@ package com.four.patient.service.Impl; +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.SymptomsDrugsFeign; import com.four.patient.mapper.RegistrationInformationMapper; import com.four.patient.service.RegistrationInformationService; import org.springframework.beans.factory.annotation.Autowired; @@ -15,12 +17,11 @@ public class RegistrationInformationServiceImpl implements RegistrationInformati @Autowired private RegistrationInformationMapper registrationInformationMapper; + @Autowired + private SymptomsDrugsFeign symptomsDrugsFeign; + + - @Override - public List ShowDepartmentAll() { - List symptomsDrugsList = registrationInformationMapper.ShowDepartmentAll(); - return symptomsDrugsList; - } @Override public List ShowRegistrationInformationAllPrice(Long medicalDepartmentId) { @@ -46,5 +47,12 @@ public class RegistrationInformationServiceImpl implements RegistrationInformati return list; } + @Override + public List ShowSymptomsDrug() { + Result> symptomDrugsAll = symptomsDrugsFeign.findSymptomDrugsAll(); + List symptomsDrugsList = symptomDrugsAll.getData(); + return symptomsDrugsList; + } + } diff --git a/src/main/java/com/four/patient/service/RegistrationInformationService.java b/src/main/java/com/four/patient/service/RegistrationInformationService.java index 9ecd227..9d80f54 100644 --- a/src/main/java/com/four/patient/service/RegistrationInformationService.java +++ b/src/main/java/com/four/patient/service/RegistrationInformationService.java @@ -8,7 +8,6 @@ import java.util.List; public interface RegistrationInformationService { - List ShowDepartmentAll(); List ShowRegistrationInformationAllPrice(Long medicalDepartmentId); @@ -19,4 +18,6 @@ public interface RegistrationInformationService { List ShowRegistrationInformationAll(Long medicalDepartmentId); + List ShowSymptomsDrug(); + } diff --git a/src/main/resources/mapper/GiftMapper.xml b/src/main/resources/mapper/GiftMapper.xml index debad76..7b90323 100644 --- a/src/main/resources/mapper/GiftMapper.xml +++ b/src/main/resources/mapper/GiftMapper.xml @@ -11,7 +11,8 @@ values ( #{giverId}, #{giftId}, - #{giftGivingTime}) + #{giftGivingTime} + ) update sys_user set @@ -42,7 +43,7 @@ from gift - gift_id = #{giftId} + and gift_id = #{giftId} @@ -50,7 +51,7 @@ select user_id from registration_information - registration_information_id=#{registrationInformationId} + and registration_information_id=#{registrationInformationId} diff --git a/src/main/resources/mapper/GiftRecordDoctorMapper.xml b/src/main/resources/mapper/GiftRecordDoctorMapper.xml index acb32bb..29b427a 100644 --- a/src/main/resources/mapper/GiftRecordDoctorMapper.xml +++ b/src/main/resources/mapper/GiftRecordDoctorMapper.xml @@ -25,7 +25,7 @@ - registration_information_id=#{registrationInformationId} + and registration_information_id=#{registrationInformationId} diff --git a/src/main/resources/mapper/HistoricalDoctorMapper.xml b/src/main/resources/mapper/HistoricalDoctorMapper.xml index fc0c2a6..94a6c9c 100644 --- a/src/main/resources/mapper/HistoricalDoctorMapper.xml +++ b/src/main/resources/mapper/HistoricalDoctorMapper.xml @@ -23,7 +23,7 @@ - registartion_information_id=#{registrationInformationId} + and registartion_information_id=#{registrationInformationId} diff --git a/src/main/resources/mapper/PatientDoctorMapper.xml b/src/main/resources/mapper/PatientDoctorMapper.xml index 8a1d8fa..9638f2c 100644 --- a/src/main/resources/mapper/PatientDoctorMapper.xml +++ b/src/main/resources/mapper/PatientDoctorMapper.xml @@ -25,7 +25,7 @@ - registration_information_id=#{registrationInformationId} + and registration_information_id=#{registrationInformationId} diff --git a/src/main/resources/mapper/RegistrationInformationMapper.xml b/src/main/resources/mapper/RegistrationInformationMapper.xml index f61eb31..94040d6 100644 --- a/src/main/resources/mapper/RegistrationInformationMapper.xml +++ b/src/main/resources/mapper/RegistrationInformationMapper.xml @@ -50,7 +50,7 @@ - r.medical_department_id = #{medicalDepartmentId} + and r.medical_department_id = #{medicalDepartmentId} ORDER BY r.consulting_price DESC @@ -59,7 +59,7 @@ - r.medical_department_id = #{medicalDepartmentId} + and r.medical_department_id = #{medicalDepartmentId} ORDER BY r.number_patients_served DESC @@ -68,22 +68,16 @@ - r.medical_department_id = #{medicalDepartmentId} + and r.medical_department_id = #{medicalDepartmentId} ORDER BY r.praise DESC -