代码修改

business/base-service/src/main/java/com/yihu/jw/hospital/survey/dao/SurveyUserAnswerDao.java

@@ -1,11 +1,9 @@
package com.yihu.jw.hospital.survey.dao;
import com.yihu.jw.entity.hospital.survey.WlyySurveyInspLabelInfoDO;
import com.yihu.jw.entity.hospital.survey.WlyySurveyUserAnswerDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
@@ -18,6 +16,8 @@ public interface SurveyUserAnswerDao extends JpaRepository<WlyySurveyUserAnswerD
    List<WlyySurveyUserAnswerDO> findBySurverUserId(String surverUserId);
    List<WlyySurveyUserAnswerDO> findBySurverUserCode(String surverUserCode);
    List<WlyySurveyUserAnswerDO> findByTempQuestionCode(String tempQuestionCode);
    @Query("From WlyySurveyUserAnswerDO c WHERE c.tempOptionCode = ?1 and c.surveyTempCode = ?2")
    List<WlyySurveyUserAnswerDO> findBytempOptionCode(String tempOptionCode,String surveyTempCode);

business/base-service/src/main/java/com/yihu/jw/hospital/survey/service/SurveyService.java

@@ -698,7 +698,6 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
        surveyUserDO.setFixDate(DateUtil.dateToStr(new Date(), "yyyy-MM-dd"));
        surveyUserDO.setId(UUID.randomUUID().toString());
        surveyUserDO = surveyUserDao.save(surveyUserDO);
        //删除问题答案
        List<WlyySurveyUserAnswerDO> dels = surveyUserAnswerDao.findBySurverUserId(surveyUserDO.getId());
        if (dels != null && dels.size() > 0) {
@@ -710,6 +709,7 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
            List<WlyySurveyUserAnswerDO> answerDOs = EntityUtils.jsonToList(suaJsons, WlyySurveyUserAnswerDO.class);
            for (WlyySurveyUserAnswerDO answerDO : answerDOs) {
                answerDO.setSurverUserId(surveyUserDO.getId());
                answerDO.setSurverUserCode(surveyUserDO.getCode());
                answerDO.setCreateTime(new Date());
                /*WlyySurveyTemplateOptionDO surveyTemplateOptionDO = surveyTemplateOptionDao.getOne(answerDO.getTempOptionCode());
                answerDO.setTempQuestionCode(surveyTemplateOptionDO.getQuestionCode());
@@ -720,7 +720,7 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
            String sql = " select * from base_patient_business a " +
                    " where a.del=1 " +
                    " and a.patient='" + surveyUserDO.getPatient() + "' " +
                    " and a.relationCode='" + surveyUserDO.getSurveyTempCode() + "' " +
                    " and a.relation_code='" + surveyUserDO.getSurveyTempCode() + "' " +
                    " and a.doctor = '" + surveyUserDO.getDoctor() + "' order by create_time desc";
            List<BasePatientBusinessDO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(BasePatientBusinessDO.class));
            BasePatientBusinessDO basePatientBusinessDO = null;
@@ -736,15 +736,18 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
                object.put("title", surveyUserDO.getSurveyTempTitle());
                object.put("content", answerDOs);
                object.put("id", surveyUserDO.getSurveyTempCode());
                object.put("surverUserCode", surveyUserDO.getCode());
            }
            this.sendImMsg(basePatientBusinessDO.getPatient(), basePatientBusinessDO.getPatientName(), basePatientBusinessDO.getSessionId(), "36", object.toJSONString(), "1");
        }
        return true;
    }
    public List<WlyySurveyUserAnswerDO> findAnswerBySurveyTempCode(String surverUserId, String patient, String tempId) {
    public List<WlyySurveyUserAnswerDO> findAnswerBySurveyTempCode(String surverUserId,String surverUserCode, String patient, String tempId) {
        List<WlyySurveyUserAnswerDO> list = null;
        if (StringUtils.isNotBlank(surverUserId)) {
        if(StringUtils.isNotBlank(surverUserCode)){
            list = surveyUserAnswerDao.findBySurverUserCode(surverUserCode);
        }else if (StringUtils.isNotBlank(surverUserId)) {
            list = surveyUserAnswerDao.findBySurverUserId(surverUserId);
        } else {
            List<WlyySurveyUserDO> surveys = surveyUserDao.findBySurvey(tempId, patient);

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/survey/WlyySurveyUserAnswerDO.java

@@ -16,6 +16,7 @@ import java.util.Date;
public class WlyySurveyUserAnswerDO extends UuidIdentityEntity {
    private String surverUserId;//答题批次号
    private String surverUserCode;//答题批次号code
    private String surveyTempCode;//问卷模板编码',
    private String tempQuestionCode;//问答题题目编码',
    private Integer questionType;//
@@ -35,6 +36,14 @@ public class WlyySurveyUserAnswerDO extends UuidIdentityEntity {
        this.surverUserId = surverUserId;
    }
    public String getSurverUserCode() {
        return surverUserCode;
    }
    public void setSurverUserCode(String surverUserCode) {
        this.surverUserCode = surverUserCode;
    }
    public String getSurveyTempCode() {
        return surveyTempCode;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/survey/WlyySurveyUserDO.java

@@ -15,6 +15,7 @@ import java.util.Date;
@Table(name = "wlyy_survey_user")
public class WlyySurveyUserDO extends UuidIdentityEntity {
    private String code;//新增唯一标识
    private String surveyTempCode;//问卷模板编码',
    private String surveyTempTitle;//模板标题
    private String patient;//患者ID',
@@ -125,4 +126,12 @@ public class WlyySurveyUserDO extends UuidIdentityEntity {
    public void setFixDate(String fixDate) {
        this.fixDate = fixDate;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/survey/SurveyEndpoint.java

@@ -261,9 +261,11 @@ public class SurveyEndpoint extends EnvelopRestEndpoint {
                                                  @ApiParam(name = "tempId", value = "模板id")
                                                  @RequestParam(value = "tempId",required = true)String tempId,
                                                  @ApiParam(name = "surverUserId", value = "答题批次号")
                                                  @RequestParam(value = "surverUserId",required = false)String surverUserId)throws Exception {
                                                  @RequestParam(value = "surverUserId",required = false)String surverUserId,
                                                  @ApiParam(name = "surverUserCode", value = "答题批次号code")
                                                  @RequestParam(value = "surverUserCode",required = false)String surverUserCode)throws Exception {
        try {
            return success(surveyService.findAnswerBySurveyTempCode(surverUserId,patient,tempId));
            return success(surveyService.findAnswerBySurveyTempCode(surverUserId,surverUserCode,patient,tempId));
        }catch (Exception e) {
            return failedListEnvelopException(e);
        }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/KnowledgeArticleService.java

@@ -323,6 +323,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
                        object.put("doctor", patientBusinessDO.getDoctor());
                        object.put("doctorName", patientBusinessDO.getDoctorName());
                        object.put("id", wlyySurveyTemplateDO.getId());
                        object.put("surverUserCode", UUID.randomUUID().toString());
                    }
                    imUtil.sendImMsg(patientBusinessDO.getDoctor(), patientBusinessDO.getDoctorName(), patientBusinessDO.getSessionId(), "17", object.toJSONString(), "1", null);
                }