代码修改

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

@@ -894,7 +894,7 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
     * @param
     * @return
     */
    public MixEnvelop findAnswerList(String tempId,String patient,String patientName,String title,Integer page,Integer size){
    public MixEnvelop findAnswerList(String tempId,String patient,String patientName,String title,Integer page,Integer size,String startTime,String endTime){
        String totalSql ="SELECT " +
                " COUNT(1) AS \"total\"" +
@@ -913,6 +913,12 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
        if(StringUtils.isNotBlank(patientName)){
            totalSql += " AND t.patient_name like  '%"+patientName+"%' ";
        }
        if(StringUtils.isNotBlank(startTime)){
            totalSql += " AND t.create_time >=  '"+startTime+" 00:00:00' ";
        }
        if(StringUtils.isNotBlank(endTime)){
            totalSql += " AND t.create_time <=  '"+endTime+" 23:59:59' ";
        }
        List<Map<String, Object>> rstotal = jdbcTemplate.queryForList(totalSql);
        Long count = 0L;
@@ -951,6 +957,12 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
        if(StringUtils.isNotBlank(tempId)){
            sql += " AND t.survey_temp_code = '"+tempId+"' ";
        }
        if(StringUtils.isNotBlank(startTime)){
            sql += " AND t.create_time >=  '"+startTime+" 00:00:00' ";
        }
        if(StringUtils.isNotBlank(endTime)){
            sql += " AND t.create_time <=  '"+endTime+" 23:59:59' ";
        }
        sql += " ORDER BY t.create_time DESC " ;
        if ("xm_ykyy_wx".equals(wxId)) {

business/base-service/src/main/java/com/yihu/jw/knowledge/service/BaseKnowledgeQuestionService.java

@@ -104,7 +104,7 @@ public class BaseKnowledgeQuestionService extends BaseJpaService<BaseKnowledgeQu
     * @param type
     * @param status
     */
    public MixEnvelop selectQuestionList(String name,String type,String status,Integer page,Integer size){
    public MixEnvelop selectQuestionList(String name,String type,String status,Integer page,Integer size,String sceneCode){
        String orderBy = " and del = 1 order by sort asc,create_time desc  ";
        String condition = " ";
        String sql = "SELECT\n" +
@@ -132,6 +132,9 @@ public class BaseKnowledgeQuestionService extends BaseJpaService<BaseKnowledgeQu
        if (StringUtils.isNoneBlank(status)){
            condition +=" and status ='"+status+"' ";
        }
        if (StringUtils.isNoneBlank(sceneCode)){
            condition +=" and scene_code like '%"+sceneCode+"%' ";
        }
        List<Map<String, Object>> list = hibenateUtils.createSQLQuery(sql+condition+orderBy, page, size);
        String sqlCount ="select COUNT(1) as total from base_knowledge_question where 1=1 ";
        List<Map<String, Object>> rstotal = hibenateUtils.createSQLQuery(sqlCount+condition+orderBy);

business/im-service/src/main/java/com/yihu/jw/im/service/RobotService.java

@@ -117,7 +117,7 @@ public class RobotService {
        map = null;
    }
    //智能导致助手回复
    //智能导诊助手回复
    public Map<String,JSONObject> robotReply(String session_id,String type,String content){
        Map<String,JSONObject> map = new HashMap<>();
        try {
@@ -396,6 +396,10 @@ public class RobotService {
                    }
                }
            }
            if(sessionStatus==1){
                //结束的会话开启
                imUtil.updateSessionStatus(session_id,"0");
            }
        }catch (Exception e){
            e.printStackTrace();
        }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/knowledge/BaseKnowledgeQuestionController.java

@@ -59,13 +59,15 @@ public class BaseKnowledgeQuestionController extends EnvelopRestEndpoint {
                                  @RequestParam(value = "type", required = false)String type,
                                  @ApiParam(name = "status", value = "1开启0关闭", required = false)
                                  @RequestParam(value = "status", required = false)String status,
                                  @ApiParam(name = "sceneCode", value = "使用场景编码", required = false)
                                  @RequestParam(value = "sceneCode", required = false)String sceneCode,
                                  @ApiParam(name = "page", value = "页码", required = false)
                                  @RequestParam(value = "page", required = false)Integer page,
                                  @ApiParam(name = "size", value = "大小", required = false)
                                  @RequestParam(value = "size", required = false)Integer size){
        try {
            return success(questionService.selectQuestionList(name,type,status,page,size));
            return success(questionService.selectQuestionList(name,type,status,page,size,sceneCode));
        }catch (Exception e){
            return failedException(e);
        }

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

@@ -308,19 +308,23 @@ public class SurveyEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "统计-综合查询问题答案")
    public MixEnvelop findAnswerList(@ApiParam(name = "tempId", value = "模板id")
                                     @RequestParam(value = "tempId",required = false) String tempId,
                                     @ApiParam(name = "patient", value = "标题")
                                     @ApiParam(name = "patient", value = "居民id")
                                     @RequestParam(value = "patient",required = false) String patient,
                                     @ApiParam(name = "patientName", value = "患者名字")
                                         @RequestParam(value = "patientName",required = false) String patientName,
                                     @RequestParam(value = "patientName",required = false) String patientName,
                                     @ApiParam(name = "title", value = "标题")
                                     @RequestParam(value = "title",required = false) String title,
                                     @ApiParam(name = "startTime", value = "开始时间")
                                     @RequestParam(value = "startTime",required = false) String startTime,
                                     @ApiParam(name = "endTime", value = "结束时间")
                                     @RequestParam(value = "endTime",required = false) String endTime,
                                     @ApiParam(name = "page", value = "第几页，1开始")
                                     @RequestParam(value = "page",required = true)Integer page,
                                     @ApiParam(name = "size", value = "每页大小")
                                     @RequestParam(value = "size",required = true)Integer size)throws Exception {
                                     @RequestParam(value = "size",required = true)Integer size){
        try {
            return surveyService.findAnswerList(tempId,patient,patientName,title,page,size);
            return surveyService.findAnswerList(tempId,patient,patientName,title,page,size,startTime,endTime);
        }catch (Exception e) {
            return failedMixEnvelopException(e);
        }