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

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/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) {