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

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/controller/SignController.java

@@ -7,6 +7,7 @@ import com.zoe.phip.ssp.sdk.ApiException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -74,12 +75,19 @@ public class SignController {
	@RequestMapping(value = "getSickFamilyDoctorSpecialistControl",method = RequestMethod.POST)
	@ApiOperation("查询家签慢病患者定标情况接口")
	public Result getSickFamilyDoctorSpecialistControl(
			@ApiParam(name="TIME_START",value="修改的开始时间",defaultValue = "2016-9-1 00:00:00")
			@RequestParam(value="TIME_START",required = true) String TIME_START,
			@ApiParam(name="TIME_END",value="修改的开始时间",defaultValue = "2016-9-1 12:00:00")
			@RequestParam(value="TIME_END",required = true) String TIME_END){
			@ApiParam(name="TIME_START",value="修改的开始时间",defaultValue = "2017-6-6 00:00:00")
			@RequestParam(value="TIME_START",required = false) String TIME_START,
			@ApiParam(name="TIME_END",value="修改的开始时间",defaultValue = "2017-6-7 23:59:59")
			@RequestParam(value="TIME_END",required = false) String TIME_END,
			@ApiParam(name="IDENTITY_CARD_NO",value="身份证号",defaultValue = "360502194503120013")
			@RequestParam(value="IDENTITY_CARD_NO",required = false) String IDENTITY_CARD_NO){
		try {
			String response = signZYService.getSickFamilyDoctorSpecialistControl(TIME_START,TIME_END);
			String response = "";
			if(StringUtils.isBlank(IDENTITY_CARD_NO)){
				response = signZYService.getSickFamilyDoctorSpecialistControl(TIME_START,TIME_END);
			}else{
				response = signZYService.getSickFamilyDoctorSpecialistControlByIdcard(IDENTITY_CARD_NO);
			}
			return Result.success("查询成功！",response);
		} catch (Exception ex) {
			ex.printStackTrace();

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/SignZYService.java

@@ -139,7 +139,7 @@ public class SignZYService {
    }
    /**
     * 查询家签慢病患者定标情况接口
     * 根据时间范围查询家签慢病患者定标情况接口
     * @param time_start
     * @param time_end
     * @return
@@ -149,4 +149,15 @@ public class SignZYService {
        String response = zysoftService.getSickFamilyDoctorSpecialistControl(time_start,time_end,hospitalMapping[0],hospitalMapping[1]);
        return response;
    }
    /**
     * 根据身份证号查询家签慢病患者定标情况接口
     * @param identity_card_no
     * @return
     */
    public String getSickFamilyDoctorSpecialistControlByIdcard(String identity_card_no) throws Exception {
        String[] hospitalMapping = getHospitalMapping(null); //获取机构映射
        String response = zysoftService.getSickFamilyDoctorSpecialistControlByIdcard(identity_card_no,hospitalMapping[0],hospitalMapping[1]);
        return response;
    }
}

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/ZysoftService.java

@@ -778,4 +778,22 @@ public class ZysoftService {
        return response;
    }
    /**
     * 根据身份证号查询家签慢病患者定标情况接口
     * @param identity_card_no
     * @return
     */
    public String getSickFamilyDoctorSpecialistControlByIdcard(String identity_card_no,String hospital,String licence) throws Exception{
        Map<String,String> header = new HashMap<>();
        header.put("ORGCODE",hospital);
        header.put("LICENCE",licence);
        Map<String,String> params = new HashMap<>();
        params.put("IDENTITY_CARD_NO",identity_card_no);
        String response = postSecond("getSickFamilyDoctorSpecialistControl","查询家签慢病患者定标情况接口",params,header,false);
        return response;
    }
}