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

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

@@ -79,19 +79,18 @@ public class PatientHealthRecordController extends WeixinBaseController {
                        images+=img+",";
                    }
                }
                if(images.lastIndexOf(",")==images.length()-1){
                if(StringUtils.isNotEmpty(images)&&images.lastIndexOf(",")==images.length()-1){
                    images = images.substring(0,images.length()-1);
                }
				// 从微信服务器获取图片
                value3 = fetchWxImages();
                value3 = CommonUtil.copyTempImage(value3);
				if(StringUtils.isNotEmpty(value3)){
					value3 = CommonUtil.copyTempImage(value3);
				}
				if(StringUtils.isNotEmpty(value3)){
                    value3=value3+","+images;
                }else {
                    value3=images;
                }
                if(value3.lastIndexOf(",")==value3.length()-1){
                    value3 = value3.substring(0,value3.length()-1);
                }
			}
			patientHealthRecordService.modifyHealthCare(id, type, value1, value2, value3, value4);