指导接口修改

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/template/DoctorGuidanceTempService.java

@@ -81,7 +81,8 @@ public class DoctorGuidanceTempService extends BaseService {
     */
    public DoctorGuidanceTemp add(String doctor, String content,String modelName,String imagesUrl) {
        DoctorGuidanceTemp guidanceTemp = new DoctorGuidanceTemp();
        String imgsUrl = "";
        String imageUrls = "";
        String imageRow = "";
        guidanceTemp.setCode(getCode());
        guidanceTemp.setOwner(doctor);
@@ -91,24 +92,26 @@ public class DoctorGuidanceTempService extends BaseService {
        guidanceTemp.setModelName(modelName);
        if (imagesUrl==null) {
        }else {
            String[] images = imagesUrl.split(",");
            for (String image: images) {
                if (image.contains("http://")){
                    imgsUrl += image+",";
                }else {
            for (String image : images) {
                if (image.contains("http://")) {
                    imageUrls += image + ",";
                } else {
                    try {
                        imgsUrl += CommonUtil.copyTempImage(image);
                        imageRow += CommonUtil.copyTempImage(image)+",";
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                }
            }
        if (imgsUrl.endsWith(",")){
            imgsUrl = imgsUrl.substring(0,imgsUrl.length()-1);
            imagesUrl = imageUrls + imageRow;
            imagesUrl =  imagesUrl.substring(0,imagesUrl.length()-1);
        }
        guidanceTemp.setImagesUrl(imgsUrl);
        guidanceTemp.setImagesUrl(imagesUrl);
        return guidanceTempDao.save(guidanceTemp);
    }
@@ -122,6 +125,8 @@ public class DoctorGuidanceTempService extends BaseService {
     */
    public DoctorGuidanceTemp modify(String code, String modelName, String content, String imagesUrl) throws Exception {
        DoctorGuidanceTemp guidanceTemp = guidanceTempDao.findByCode(code);
        String imageUrls = "";
        String imageRow = "";
        if (guidanceTemp == null) {
            throw new Exception("模板不存在");
@@ -129,6 +134,26 @@ public class DoctorGuidanceTempService extends BaseService {
        guidanceTemp.setModelName(modelName);
        guidanceTemp.setContent(content);
        if (imagesUrl==null) {
        }else {
            String[] images = imagesUrl.split(",");
            for (String image : images) {
                if (image.contains("http://")) {
                    imageUrls += image + ",";
                } else {
                    try {
                        imageRow += CommonUtil.copyTempImage(image)+",";
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                }
            }
            imagesUrl = imageUrls + imageRow;
            imagesUrl =  imagesUrl.substring(0,imagesUrl.length()-1);
        }
        guidanceTemp.setImagesUrl(imagesUrl);
        return guidanceTempDao.save(guidanceTemp);

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

@@ -119,6 +119,7 @@ public class DoctorHealthGuidanceController extends WeixinBaseController {
	 * @param content 指导内容
	 * @param modelCode 指导模板编码
	 * @param images   指导图片
	 * @param voice   指导语音
	 * @return
	 */
	@RequestMapping(value = "add")
@@ -128,6 +129,9 @@ public class DoctorHealthGuidanceController extends WeixinBaseController {
					  @RequestParam(required = false) String modelCode,
					  @RequestParam(required = false) String images,
					  @RequestParam(required = false) String voice) {
//		patient = "9aa5c557e06a4324911487a035195545";
		String imageUrls = "";
		String imageRow = "";
		if(StringUtils.isBlank(modelCode)) {
//			不使用模板指导，旧版手工指导
@@ -136,13 +140,32 @@ public class DoctorHealthGuidanceController extends WeixinBaseController {
				guidance.setContent(content);
				guidance.setDoctor(getUID());
				guidance.setPatient(patient);
//				找到当前医生
				Doctor doctor = doctorService.findDoctorByCode(getUID());
				if (StringUtils.isNotEmpty(images)) {
					images = CommonUtil.copyTempImage(images);
				if (images==null) {
				}else {
					String[] imgs = images.split(",");
					for (String image : imgs) {
						if (image.contains("http://")) {
							imageUrls += image + ",";
						} else {
							try {
								imageRow += CommonUtil.copyTempImage(image)+",";
							} catch (Exception e) {
								e.printStackTrace();
							}
						}
					}
					images = imageUrls + imageRow;
					images =  images.substring(0,images.length()-1);
				}
				/*if (StringUtils.isNotEmpty(images)) {
					images = CommonUtil.copyTempImage(images);
				}*/
				guidance.setImages(images);
				// 保存
				// 保存到居民端健康指导
				if (patientHealthGuidanceService.add(guidance, getAccessToken()) != null) {
					Patient p = patientService.findByCode(patient);
					String imcotent  = "{\"title\":\"健康指导\",\"type\":2,\"id\":\"" + guidance.getId() + "\",\"img\":\"" + guidance.getImages() + "\",\"content\":\""+CommonUtil.getSubString(guidance.getContent(),0,30)+"\"}";
@@ -163,6 +186,24 @@ public class DoctorHealthGuidanceController extends WeixinBaseController {
				guidance.setDoctor(getUID());
				guidance.setPatient(patient);
				Doctor doctor = doctorService.findDoctorByCode(getUID());
				if (images==null) {
				}else {
					String[] imgs = images.split(",");
					for (String image : imgs) {
						if (image.contains("http://")) {
							imageUrls += image + ",";
						} else {
							try {
								imageRow += CommonUtil.copyTempImage(image)+",";
							} catch (Exception e) {
								e.printStackTrace();
							}
						}
					}
					images = imageUrls + imageRow;
					images =  images.substring(0,images.length()-1);
				}
				guidance.setImages(images);
				// 保存

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/template/DoctorGuidanceTempController.java

@@ -114,7 +114,7 @@ public class DoctorGuidanceTempController extends BaseController {
    public String modify(@RequestParam @ApiParam(value = "指导编码") String code,
                         @RequestParam @ApiParam(value = "模板标题") String modelName,
                         @RequestParam @ApiParam(value = "指导内容") String content,
                         @RequestParam @ApiParam(value = "图片地址") String imagesUrl
                         @RequestParam(required = false) @ApiParam(value = "图片地址")  String imagesUrl
                         ) {
        try {
            if (StringUtils.isEmpty(code)) {