Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

# Conflicts:
#	patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/manager/specialist/HopsitalServiceItemController.java
#	patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/specialist/SpecialistHospitalItemService.java

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/config/SpringSecurityConfig.java

@@ -58,7 +58,8 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
                "/admin/surveyAdvice/**",
                "/admin/surveyTemplateAdvice/**",
                "/admin/paylog/**",
                "/admin/static/consult/**"
                "/admin/static/consult/**",
                "/admin/specialist/hospitalServiceItem/importData"
        );
    }

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

@@ -32,7 +32,7 @@ public class HopsitalServiceItemController extends BaseController {
    @RequestMapping(value = "initial")
    public String listInit() {
        return "desizenMan/new-institutional-projects";
        return "desizenMan/service_project_management";
    }
@@ -64,9 +64,10 @@ public class HopsitalServiceItemController extends BaseController {
     */
    @RequestMapping(value = "selectHospital", method = RequestMethod.POST)
    @ResponseBody
    public String selectHospitals(@RequestParam(name = "hospitalName") String hospitalName){
    public String selectHospitals(@RequestParam(name = "hospitalName",required = false) String hospitalName,
                                  @RequestParam(name = "grade",required = false) Integer grade){
        try {
            return write(200, "查询成功", "data",specialistHospitalItemService.selectHospital(hospitalName));
            return write(200, "查询成功", "data",specialistHospitalItemService.selectHospital(hospitalName,grade));
        } catch (Exception ex) {
            error(ex);
            return error(-1, "查询失败");
@@ -121,9 +122,10 @@ public class HopsitalServiceItemController extends BaseController {
    @RequestMapping(value = "deleteHospitalItem", method = RequestMethod.POST)
    @ResponseBody
    public String delete(@RequestParam(name = "serviceItem",required = false) String serviceItem,
                                    @RequestParam(name = "hospital",required = false) String hospital){
                                    @RequestParam(name = "hospital",required = false) String hospital,
                         @RequestParam(name = "id",required = false) String id){
        try {
            return write(200, "删除成功", "data",specialistHospitalItemService.delete(serviceItem,hospital));
            return write(200, "删除成功", "data",specialistHospitalItemService.delete(serviceItem,hospital,id));
        } catch (Exception ex) {
            error(ex);
            return error(-1, "删除失败");

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

@@ -81,7 +81,7 @@ public class ServiceItemController  extends BaseController {
     * @param pageSize
     * @return
     */
    @RequestMapping(value = "selectServiceItem", method = RequestMethod.POST)
    @RequestMapping(value = "selectServiceItem", method = RequestMethod.GET)
    @ResponseBody
    public String selectServiceItem(@RequestParam(name = "serviceItem") String serviceItem,
                                    @RequestParam(name = "page",defaultValue = "1")Integer page,

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

@@ -18,6 +18,8 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import javax.transaction.Transactional;
@@ -45,6 +47,8 @@ public class SpecialistHospitalItemService extends BaseService {
    private SystemDictDao systemDictDao;
    @Autowired
    private HttpClientUtil httpClientUtil;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    /**
     * 获取url
@@ -67,14 +71,20 @@ public class SpecialistHospitalItemService extends BaseService {
     *
     * @return
     */
    public List<Hospital> selectHospital(String hospitalName){
    public List<Hospital> selectHospital(String hospitalName,Integer grade){
        List<Hospital> hospitals = new ArrayList<>();
        if (StringUtils.isNoneBlank(hospitalName)){
            Hospital hospital = new Hospital();
            hospital = hospitalDao.findByName(hospitalName);
            hospitals.add(hospital);
        if (StringUtils.isNoneBlank(hospitalName) &&  grade != 0){
            String sql = "select * from dm_hospital where name like '%"+hospitalName+"%' AND grade = "+grade;
            hospitals = jdbcTemplate.query(sql,new BeanPropertyRowMapper(Hospital.class));
        } else if (StringUtils.isNoneBlank(hospitalName)){
            String sql = "select * from dm_hospital where name like '%"+hospitalName+"%'";
            hospitals = jdbcTemplate.query(sql,new BeanPropertyRowMapper(Hospital.class));
        }else if (grade != 0){
            String sql = "select * from dm_hospital where grade = "+grade+"";
            hospitals = jdbcTemplate.query(sql,new BeanPropertyRowMapper(Hospital.class));
        }else {
            hospitals = hospitalDao.findAllHospital();
        }
        hospitals = hospitalDao.findAllHospital();
        return hospitals;
    }
@@ -150,12 +160,13 @@ public class SpecialistHospitalItemService extends BaseService {
    /**
     * 删除机构服务项目
     */
    public JSONObject delete(String serviceItem,String hospital){
    public JSONObject delete(String serviceItem,String hospital,String id){
        String response = null;
        String url =getBaseUrl() + "deleteHospitalItem";
        Map<String,String> params = new HashMap<>();
        params.put("hospital",hospital);
        params.put("serviceItem",serviceItem);
        params.put("id",id);
        try {
            response = httpClientUtil.httpPost(url,params);
        }catch (Exception e){