代码修改

business/base-service/src/main/java/com/yihu/jw/hospital/disease/service/BaseDiseaseHospitalService.java

@@ -139,7 +139,7 @@ public class BaseDiseaseHospitalService extends BaseJpaService<BaseDiseaseHospit
    //筛查患者管理
    public PageEnvelop surveyRecordPage(String name, String idcard, String startDate, String endDate, String mobile,
                                        String status, Integer page, Integer size,String dept,String diseaseCode){
        String sql = "SELECT DISTINCT r.*,s.name diseaseName,s.dept_name deptName,d.dict_value statusName ";
        String sql = "SELECT DISTINCT r.*,s.name diseaseName,s.dept_name deptName,d.dict_value statusName,s.survey_code surveyCode  ";
        String countSql = "select count(r.id) ";
        String filter = " FROM wlyy_survey_record r " +
                " inner join base_disease_survey s on r.disease_code=s.id " +

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/common/CommonItemController.java

@@ -1,12 +1,18 @@
package com.yihu.jw.hospital.module.common;
import com.yihu.jw.entity.third.wlyyinfo.OauthWlyyConfigDO;
import com.yihu.jw.hospital.module.door.service.DoorOrderService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.wlyy.dao.OauthWlyyConfigDao;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +26,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
/**
@@ -36,7 +43,29 @@ public class CommonItemController extends EnvelopRestEndpoint {
    private DoorOrderService doorOrderService;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private OauthWlyyConfigDao oauthWlyyConfigDao;
    @Autowired
    private HttpClientUtil httpClientUtil;
    @ApiOperation("查询字典-获取i健康通用字典接口")
    @GetMapping(value= "getIjkDictByDictName")
    public Envelop getIjkDictByDictName(
            @ApiParam(name = "name", value = "name", required = false) @RequestParam(value = "name", required = false)String name
    ){
        try {
            OauthWlyyConfigDO oauthWlyyConfigDO = oauthWlyyConfigDao.findById("getIjkDictByDictName").orElse(null);
            List<NameValuePair> params = new ArrayList<>();
            if(StringUtils.isNotBlank(name)){
                params.add(new BasicNameValuePair("name",name));
            }
            String res = httpClientUtil.get(oauthWlyyConfigDO.getUrl(), params, "UTF-8");
            return ObjEnvelop.getSuccess("查询成功",res);
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("查询失败",-1);
        }
    }
    /**
     * 这个接口没用了