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

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

@@ -249,10 +249,11 @@ public class GuahaoController {
	/**
	 * =============================计免预约挂号相关接口======================================START
	 */
	@RequestMapping(value = "GetChildrenInfo",method = RequestMethod.POST)
	@RequestMapping(value = "/imm/GetChildrenInfo",method = RequestMethod.POST)
	@ResponseBody
	@ApiOperation("获取儿童信息")
	public Result GetChildrenInfo(@ApiParam(name="Credential",value="条形编码") @RequestParam String credential)
	@ApiOperation("计免：获取儿童信息")
	public Result GetChildrenInfo(@ApiParam(name="credential",value="条形编码",defaultValue = "0052248552")
								@RequestParam String credential)
	{
		try {
			

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

@@ -1157,15 +1157,13 @@ public class GuahaoService {
    /**
     * 获取儿童信息
     * @param credential 条形编码
     * @param orgCode
     * @param regCode
     * @return
     */
    public String GetChildrenInfo(String credential)throws Exception  {
        String result = "";
    
        Map<String,String> params = new HashMap<>();
        params.put("Credential", credential);
        params.put("BarCode", credential);
        
        return immPostSecond("GetChildrenInfo","计免预约-获取儿童信息",params);
    }