Merge branch 'dev' of wangzhinan/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/manager/specialist/HopsitalServiceItemController.java

@@ -56,11 +56,11 @@ public class HopsitalServiceItemController extends BaseController {
     * 获取机构
     * @return
     */
    @RequestMapping(value = "selectByHospital", method = RequestMethod.POST)
    @RequestMapping(value = "selectHospital", method = RequestMethod.POST)
    @ResponseBody
    public String selectHospitals(){
    public String selectHospitals(@RequestParam(name = "hospitalName") String hospitalName){
        try {
            return write(200, "查询成功", "data",specialistHospitalItemService.selectHospital());
            return write(200, "查询成功", "data",specialistHospitalItemService.selectHospital(hospitalName));
        } catch (Exception ex) {
            error(ex);
            return error(-1, "查询失败");
@@ -83,4 +83,24 @@ public class HopsitalServiceItemController extends BaseController {
            return error(-1, "查询失败");
        }
    }
    /**
     * 获取机构服务项目
     *
     * @param serviceItemName
     * @param hospital
     * @return
     */
    @RequestMapping(value = "selectByCondition", method = RequestMethod.POST)
    @ResponseBody
    public String selectByCondition(@RequestParam(name = "serviceItemName",required = false) String serviceItemName,
                                    @RequestParam(name = "hospital",required = false) String hospital){
        try {
            return write(200, "查询成功", "data",specialistHospitalItemService.selectCondition(serviceItemName,hospital));
        } catch (Exception ex) {
            error(ex);
            return error(-1, "查询失败");
        }
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/specialist/SpecialistHospitalItemService.java

@@ -2,17 +2,21 @@ package com.yihu.wlyy.service.manager.specialist;/**
 * Created by nature of king on 2018/8/28.
 */
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.wlyy.entity.Hospital;
import com.yihu.wlyy.repository.HospitalDao;
import com.yihu.wlyy.repository.SystemDictDao;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.util.HttpClientUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import javax.transaction.Transactional;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -29,23 +33,55 @@ public class SpecialistHospitalItemService extends BaseService {
    private static org.slf4j.Logger logger = LoggerFactory.getLogger(SpecialistHospitalItemService.class);
    @Autowired
    private HospitalDao hospitalDao;
    private static String URL = "specialist:url";
    @Autowired
    private RedisTemplate redisTemplate;
    @Autowired
    private SystemDictDao systemDictDao;
    @Autowired
    private HttpClientUtil httpClientUtil;
    @Value("${specialist.url}")
    private String specialistUrl;
    /**
     * 获取url
     *
     * @return
     */
    public  String getBaseUrl(){
        String url = (String) redisTemplate.opsForValue().get(URL);
        String url1 = systemDictDao.findByDictNameAndCode3("SPECIALIST_URL","SPECIALIST_URL");
        if (url != null && url1.equalsIgnoreCase(url)){
            return url;
        }else {
            redisTemplate.opsForValue().set(URL,url1);
            return url1;
        }
    }
    /**
     * 获取医院
     *
     * @return
     */
    public List<Hospital> selectHospital(){
        List<Hospital> hospitals = hospitalDao.findAllHospital();
    public List<Hospital> selectHospital(String hospitalName){
        List<Hospital> hospitals = new ArrayList<>();
        if (StringUtils.isNoneBlank(hospitalName)){
            Hospital hospital = new Hospital();
            hospital = hospitalDao.findByName(hospitalName);
            hospitals.add(hospital);
        }
        hospitals = hospitalDao.findAllHospital();
        return hospitals;
    }
    /**
     * 添加机构服务项目
     *
     * @param hospitalServiceItem
     * @return
     */
    public JSONObject insert(String hospitalServiceItem){
        String response = null;
        String url =specialistUrl + "svr-specialist/createHospitalServiceItem";
        String url =getBaseUrl() + "createHospitalServiceItem";
        Map<String,String> params = new HashMap<>();
        params.put("hospitalServiceItem",hospitalServiceItem);
        try {
@@ -66,7 +102,7 @@ public class SpecialistHospitalItemService extends BaseService {
     */
    public JSONObject selectItemByHospital(String hospital){
        String response = null;
        String url =specialistUrl + "svr-specialist/selectItemByHospital";
        String url =getBaseUrl() + "selectItemByHospital";
        Map<String,String> params = new HashMap<>();
        params.put("hospital",hospital);
        try {
@@ -78,4 +114,31 @@ public class SpecialistHospitalItemService extends BaseService {
        return JSONObject.parseObject(response);
    }
    /**
     * 根据条件查找
     *
     * @param serviceItemName
     * @param hospital
     * @return
     */
    public JSONObject selectCondition(String serviceItemName,String hospital){
        JSONArray array = new JSONArray();
        if (StringUtils.isNoneBlank(hospital)){
            array.add(hospital);
        }
        String response = null;
        String url =getBaseUrl() + "selectItemByHospital";
        Map<String,String> params = new HashMap<>();
        params.put("serviceItemName",serviceItemName);
        params.put("hospitals",array.toJSONString());
        try {
            response = httpClientUtil.httpPost(url,params);
        }catch (Exception e){
            e.printStackTrace();
            logger.error(e.getMessage());
        }
        return JSONObject.parseObject(response);
    }
}