标签语法修改

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -23,8 +23,10 @@ import com.yihu.wlyy.repository.doctor.DoctorPatientDao;
import com.yihu.wlyy.repository.doctor.DoctorTeamDao;
import com.yihu.wlyy.repository.doctor.DoctorTeamMemberDao;
import com.yihu.wlyy.repository.patient.SignFamilyDao;
import com.yihu.wlyy.service.app.health.PatientHealthGuidanceService;
import com.yihu.wlyy.util.HttpUtil;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
@@ -72,6 +74,8 @@ public class ConsultTeamService extends ConsultService {
    private DoctorTeamMemberDao doctorTeamDoctor;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private PatientHealthGuidanceService guidanceService;
    /**
     * 查询患者是否还有未结束的三师咨询
@@ -596,7 +600,17 @@ public class ConsultTeamService extends ConsultService {
        List<ConsultTeamLog> logs = new ArrayList<ConsultTeamLog>();
        // 添加问题咨询日志
        String content = "";
        content = "咨询问题：" + (StringUtils.isEmpty(ct.getSymptoms()) ? "无" : ct.getSymptoms());
        if(ct.getGuidance() > 0){
            JSONObject json = guidanceService.findById(ct.getGuidance());
            if(json == null){
                throw new Exception("guidance not exist");
            }
            content += "医生" + (json.get("doctorName") != null? json.get("doctorName").toString():"")
                    + "发出的指导:" + (json.getString("content") != null ? json.getString("content").toString() :"") + "<br/>";
        }
        content += "咨询问题：" + (StringUtils.isEmpty(ct.getSymptoms()) ? "无" : ct.getSymptoms());
        // 生成提问日志，并推送相关消息
        ConsultTeamLog infoLog = new ConsultTeamLog();

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/health/PatientHealthGuidanceService.java

@@ -50,7 +50,7 @@ public class PatientHealthGuidanceService extends BaseService {
			obj.put("patientName",p.getName());
			return obj;
		}else{
			return new JSONObject();
			return null;
		}
	}