Merge branch 'dev' of http://192.168.1.220:10080/Amoy/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/template/DoctorTeamGuidanceService.java

@@ -425,8 +425,8 @@ public class DoctorTeamGuidanceService extends BaseService {
        // 保存
        if (patientHealthGuidanceService.add(guidance, accessToken) != null) {
            String sendImgs = "";
            if (StringUtils.isNotBlank(images)) {
                sendImgs = images;
            if (StringUtils.isNotBlank(image)) {
                sendImgs = image;
            }
            Patient p = patientDao.findByCode(patient);
            String imcotent = "{\"title\":\"健康指导\",\"type\":2,\"id\":\"" + guidance.getId() + "\",\"img\":\"" + sendImgs + "\",\"content\":\"" + CommonUtil.getSubString(guidance.getContent(), 0, 30) + "\"}";

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");
//

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/health/DoctorHealthGuidanceController.java

@@ -10,6 +10,7 @@ import com.yihu.wlyy.service.app.health.PatientHealthGuidanceService;
import com.yihu.wlyy.service.common.account.DoctorService;
import com.yihu.wlyy.service.common.account.PatientService;
import com.yihu.wlyy.service.template.DoctorGuidanceTempService;
import com.yihu.wlyy.service.template.DoctorTeamGuidanceService;
import com.yihu.wlyy.util.CommonUtil;
import com.yihu.wlyy.web.WeixinBaseController;
import io.swagger.annotations.Api;
@@ -52,6 +53,8 @@ public class DoctorHealthGuidanceController extends WeixinBaseController {
    //======================
    @Autowired
    DoctorGuidanceTempService doctorGuidanceTempService;
    @Autowired
    private DoctorTeamGuidanceService doctorTeamGuidanceService;
//	=======================
    /**
@@ -150,7 +153,7 @@ public class DoctorHealthGuidanceController extends WeixinBaseController {
                guidance.setPatient(patient);
//				找到当前医生
                Doctor doctor = doctorService.findDoctorByCode(getUID());
                if (images == null || "".equals(images)) {
               /* if (images == null || "".equals(images)) {
                    images = null;
                } else {
                    String[] imgs = images.split(",");
@@ -168,10 +171,13 @@ public class DoctorHealthGuidanceController extends WeixinBaseController {
                    images = imageUrls + imageRow;
                    images = images.substring(0, images.length() - 1);
                }
                }*/
				/*if (StringUtils.isNotEmpty(images)) {
					images = CommonUtil.copyTempImage(images);
				}*/
                if (StringUtils.isNotEmpty(images)) {
                    images = doctorTeamGuidanceService.validateImages(images);
                }
                guidance.setImages(images);
                // 保存到居民端健康指导
@@ -195,9 +201,12 @@ public class DoctorHealthGuidanceController extends WeixinBaseController {
                guidance.setDoctor(getUID());
                guidance.setPatient(patient);
                Doctor doctor = doctorService.findDoctorByCode(getUID());
                if (images == null || "".equals(images)) {
                    images = null;
                if (StringUtils.isNotEmpty(images)) {
                    images = doctorTeamGuidanceService.validateImages(images);
                }
                /*if (images == null || "".equals(images)) {
                    images = null;
                }*/
//                else {
//                    String[] imgs = images.split(",");
//                    for (String image : imgs) {