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

@@ -269,12 +269,11 @@ public class GuahaoController {
	@RequestMapping(value = "/imm/GetOrgImmuneList",method = RequestMethod.POST)
	@ResponseBody
	@ApiOperation("计免：获取免疫接种机构列表")
	public Result GetOrgImmuneList(@ApiParam(name="Condition",value="",defaultValue = "")
	                              @RequestParam String Condition)
	public Result GetOrgImmuneList()
	{
		try {
			
			String data = guahaoService.GetOrgImmuneList(Condition);
			String data = guahaoService.GetOrgImmuneList();
			
			return Result.success("获取免疫接种机构列表！",data);
		} catch (Exception ex) {

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

@@ -1164,10 +1164,10 @@ public class GuahaoService {
        String re = "";
    
        ZysoftApi api = ZysoftApi.getSingleton();
        if(!params.containsKey("Credential")&&!params.containsKey("key")) {
        if(!params.containsKey("Credential")&&!params.containsKey("Key")) {
            //strCredential和strKey设置
            params.put("Credential", api.getCryptoCredential());
            params.put("key", api.getCryptoKey());
            params.put("Key", api.getCryptoKey());
        }
        
        String msgBody = net.sf.json.JSONObject.fromObject(params).toString();
@@ -1287,9 +1287,10 @@ public class GuahaoService {
     * @param condition
     * @return
     */
    public String GetOrgImmuneList(String condition)throws Exception  {
    public String GetOrgImmuneList()throws Exception  {
        String result = "";
        Map<String,String> params = new HashMap<>();
        String condition = "<root><zone>350203</zone><zone>350206</zone><zone>350205</zone><zone>350211</zone><zone>350212</zone><zone>350213</zone></root>";
        params.put("Condition", condition);
        return immPostSecond("GetOrgImmuneList","计免预约-获取免疫接种机构列表",params);
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/guahao/ImmuneService.java

@@ -71,7 +71,6 @@ public class ImmuneService {
//
//		String url = jwUrl + "/third/guahao/imm/GetOrgImmuneList";
//		List<NameValuePair> params = new ArrayList<>();
//		params.add(new BasicNameValuePair("Condition", ""));
//
//		String response = httpClientUtil.post(url, params, "UTF-8");
//