common/common-entity/sql记录

@@ -1943,3 +1943,7 @@ INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_
INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('pushOnOff4', NULL, 'pushOnOff', '4', '报警器电量提示', NULL, 4, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('pushOnOff5', NULL, 'pushOnOff', '5', '设备离线提示', NULL, 5, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('pushOnOff6', NULL, 'pushOnOff', '6', '体征监测提醒', NULL, 6, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-- 2022-07-08 xyq 把视频表视频和图片全路径改成半路径
UPDATE base_video set url = REPLACE(url,'https://zhyzh.gongshu.gov.cn/',''),img = REPLACE(img,'https://zhyzh.gongshu.gov.cn/','');

common/common-entity/src/main/java/com/yihu/jw/entity/followup/Followup.java

@@ -3,7 +3,6 @@ package com.yihu.jw.entity.followup;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.iot.gateway.IdEntity;
import javax.persistence.*;
import java.util.Date;
@@ -31,7 +30,7 @@ public class Followup extends IntegerIdentityEntity {
	//随访方式【字典FOLLOWUP_WAY_DICT】
	private String followupType;
	//随访类别，多类别“，”分割【1.高血压 2.糖尿病 3.肿瘤 4.精神分裂症 5.产后 6.新生儿 7.严重精神病 8.80岁以上老人 9.肺结核 10异常体温随访
	// 11.冠心病日常随访 12.慢性妇科炎症13.慢性前列腺疾病日常随访 14.慢性乳腺疾病日常随访 15慢性肾病日常随访 16慢性阻塞性肺病 17脑卒中日常随访 18脂肪肝日常随访
	// 11.冠心病日常随访 12.慢性妇科炎症13.慢性前列腺疾病日常随访 14.慢性乳腺疾病日常随访 15慢性肾病日常随访 16慢性阻塞性肺病 17脑卒中日常随访 18脂肪肝日常随访 21厦心冠心病社区随访
	private String followupClass;
	//随访管理状态【字典FOLLOWUP_MANAGER_STATUS】
	private String followupManagerStatus;

svr/svr-base/src/main/java/com/yihu/jw/base/service/radio/WlyyRadioService.java

@@ -40,7 +40,7 @@ public class WlyyRadioService extends BaseJpaService<WlyyRadioDO, WlyyRadioDao>
        String colSql = "SELECT id,name,frequency,introduction,url,sort_num sortNum, " +
                " CAST(DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%S') as char) createTime,CAST(status as UNSIGNED) status ";
        String sql = " from wlyy_radio " +
                " where status = 1 ";
                " where 1 = 1 ";
        if(StringUtils.isNotBlank(name)){
            sql += " and name like '%"+name+"%' ";
        }

svr/svr-base/src/main/java/com/yihu/jw/base/service/video/BaseVideoGroupService.java

@@ -43,7 +43,7 @@ public class BaseVideoGroupService extends BaseJpaService<BaseVideoGroupDO, Base
        page = page>0?page-1:0;
        String colSql = "SELECT id,name,sort_num sortNum,CAST(status AS UNSIGNED) status,CAST(DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%S') as char) createTime ";
        String countSql = "select count(*) ";
        String sql = " from base_video_group where status = 1 ";
        String sql = " from base_video_group where 1 = 1 ";
        if(StringUtils.isNotBlank(name)){
            sql += " and name like '%"+name+"%' ";
        }
@@ -104,7 +104,7 @@ public class BaseVideoGroupService extends BaseJpaService<BaseVideoGroupDO, Base
        String colSql = "SELECT v.id,v.type,v.title,v.url,v.img,CAST(DATE_FORMAT(v.create_time,'%Y-%m-%d %H:%i:%S') as char) createTime, " +
                " v.introduction,v.sort_num sortNum,CAST(v.status as UNSIGNED) status,g.name ";
        String countSql = "SELECT count(*) ";
        String fromSql = " from base_video v left join base_video_group g on v.type = g.id where v.status = 1 ";
        String fromSql = " from base_video v left join base_video_group g on v.type = g.id where 1 = 1 ";
        if(StringUtils.isNotBlank(title)){
            fromSql += " and v.title like '%"+title+"%' ";
        }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/video/BaseVideoService.java

@@ -25,10 +25,10 @@ public class BaseVideoService {
     * @return
     */
    public ListEnvelop getVideoGroup(){
        String sql = "SELECT id,name,sort_num sortNum,CAST(status as UNSIGNED) status," +
                " CAST(DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%S') as char) createTime " +
                " from base_video_group " +
                " where status = 1 order by sort_num desc ";
        String sql = "SELECT g.id,g.name,g.sort_num sortNum,CAST(g.status as UNSIGNED) status," +
                " CAST(DATE_FORMAT(g.create_time,'%Y-%m-%d %H:%i:%S') as char) createTime,count(v.id) videoTotal " +
                " from base_video_group g left join base_video v on v.type = g.id " +
                " where g.status = 1 GROUP BY g.id order by g.sort_num desc ";
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        return ListEnvelop.getSuccess("查询成功",list);
    }
@@ -47,8 +47,8 @@ public class BaseVideoService {
                " v.introduction,v.sort_num sortNum,CAST(v.status as UNSIGNED) status,g.name ";
        String countSql = "select count(v.id) ";
        String sql = " from base_video v " +
                " left join base_video_group g on v.type = g.id " +
                " where v.status = 1 ";
                " inner join base_video_group g on v.type = g.id " +
                " where v.status = 1 and g.status = 1 ";
        if(groupId > 0){
            sql += " and v.type = "+groupId+" ";
        }

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/controller/SpecialistScreenResultController.java

@@ -38,9 +38,10 @@ public class SpecialistScreenResultController extends EnvelopRestEndpoint {
                                                                            @ApiParam(value = "搜索居民的姓名或身份证") @RequestParam(value = "patientName", required = false) String patientName,
                                                                            @ApiParam(value = "1已跟踪 2已预约 3已接诊 4待处理")@RequestParam(value = "type",required = false) Integer type,
                                                                            @ApiParam(value = "是否高危预警(0否 1是)") @RequestParam(value = "isDanger", required = false) String isDanger,
                                                                            @ApiParam(value = "疾病类型") @RequestParam(value = "diseaseType", required = false) String diseaseType){
                                                                            @ApiParam(value = "疾病类型") @RequestParam(value = "diseaseType", required = false) String diseaseType,
                                                                            @ApiParam(value = "传1则根据类型查一条数据")@RequestParam(value = "filterType",required = false,defaultValue = "0")Integer filterType){
        try {
            return specialistScreenResultService.getScreenList(doctor,type,pageNo,pageSize,patientName, isDanger, diseaseType);
            return specialistScreenResultService.getScreenList(doctor,type,pageNo,pageSize,patientName, isDanger, diseaseType,filterType);
        }catch (Exception e){
            e.printStackTrace();
            tracer.getCurrentSpan().logEvent(e.getMessage());

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/rehabilitation/RehabilitationManageService.java

@@ -481,7 +481,10 @@ public class RehabilitationManageService {
                " where  d.plan_id in ("+planCondition+" )AND  d.execute_time IS NOT NULL  and d.execute_time <>'' " ;
        if(searchTask!=null){
            if(searchTask==8){//
                sql+="and d.doctor='"+doctorCode+"' ";
                if(StringUtils.isNotBlank(doctorCode)){
                    sql+=" and d.doctor='"+doctorCode+"' ";
                }
                sql+=" and i.code="+searchTask+" " ;
            }else {
                sql+=" and i.code="+searchTask+" " ;
            }/*else if(searchTask==5){
@@ -518,12 +521,12 @@ public class RehabilitationManageService {
                list = jdbcTemplate.queryForList(cfxfSql);
            }
            if (6 == searchTask){ //随访
                String sfSql = "SELECT DISTINCT DATE_FORMAT(wf.followup_date,'%Y/%m/%d %H:%i') followupDate,DATE_FORMAT(wf.followup_plan_date,'%Y/%m/%d %H:%i') executeTime,wf.doctor_code doctorCode," +
            if (6 == searchTask || searchTask == 8){ //随访
                String sfSql = "SELECT DISTINCT DATE_FORMAT(wf.followup_date,'%Y/%m/%d %H:%i') followupDate,DATE_FORMAT(wf.followup_plan_date,'%Y/%m/%d %H:%i') executeTime,wf.doctor_code doctorCode,wf.followup_class followupClass, " +
                        " wf.patient_code AS patientCode,wf.patient_name AS patientName,wf.doctor_name doctorName,wf.`status` AS `status`,wf.org_name orgName," +
                        " wf.org_code orgCode,sd.value AS `value`, wf.followup_type  followupType,wf.id AS id, 6 AS code,2 as flag FROM  wlyy.wlyy_followup wf " +
                        " LEFT JOIN wlyy.system_dict sd ON wf.followup_type = sd.CODE " +
                        " AND sd.dict_name = 'FOLLOWUP_WAY_DICT' WHERE wf.status !=0  AND wf.patient_code = '"+patient+"' ";
                        " AND sd.dict_name = 'FOLLOWUP_WAY_DICT' WHERE wf.status !=0  AND wf.patient_code = '"+patient+"' order by wf.followup_plan_date desc  ";
                list = jdbcTemplate.queryForList(sfSql);
            }
            if (list!=null&&list.size()>0)rehabilitationDetailList.addAll(list);