Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

 Conflicts:

	common/common-entity/sql/sql记录.txt

business/base-service/src/main/java/com/yihu/jw/dailyReport/service/DailyReportUploadService.java

@@ -517,7 +517,7 @@ public class DailyReportUploadService {
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public BaseDailyReportUploadDO verifiedItem(String doctorId,String reportId,List<BaseDailyReportDetailDO> detailDOList) throws Exception {
    public BaseDailyReportUploadDO verifiedItem(String doctorId,String reportId,List<BaseDailyReportDetailDO> detailDOList,String leaderComment) throws Exception {
        String  doubtSql = " select dict_value from  wlyy_hospital_sys_dict where dict_name='healthUpload' and dict_code='healthUpload' ";
        List<String> dictValues = jdbcTemplate.queryForList(doubtSql,String.class);
        JSONObject doubtTypeObj = new JSONObject();
@@ -539,6 +539,9 @@ public class DailyReportUploadService {
        if (DateUtil.getDays(nowDate,dailyReportUploadDO.getReportDate())>7){
            throw  new Exception("上传记录已超过7天无法再次操作");
        }
        if (StringUtils.isNotBlank(leaderComment)){
            dailyReportUploadDO.setLeaderComment(leaderComment);
        }
        Set<String> doubtTypeName = new HashSet<>();
        if(detailDOList.size()>0){//无完成事项内容
            boolean doubt  =false;

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -42,7 +42,6 @@ import com.yihu.jw.entity.hospital.dict.WlyyChargeDictDO;
import com.yihu.jw.entity.hospital.doctor.WlyyDoctorOnlineTimeDO;
import com.yihu.jw.entity.hospital.doctor.WlyyDoctorWorkTimeDO;
import com.yihu.jw.entity.hospital.doctor.WlyyPatientRegisterTimeDO;
import com.yihu.jw.entity.hospital.healthCare.YlzMedicalIcdDO;
import com.yihu.jw.entity.hospital.healthCare.YlzMedicalMxDO;
import com.yihu.jw.entity.hospital.healthCare.YlzMedicalRelationDO;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
@@ -64,7 +63,6 @@ import com.yihu.jw.hospital.doctor.dao.DoctorWorkTimeDao;
import com.yihu.jw.hospital.doctor.dao.PatientRegisterTimeDao;
import com.yihu.jw.hospital.doctor.dao.WlyyDoctorOnlineTimeDao;
import com.yihu.jw.hospital.drugstore.dao.BaseDrugStoreDao;
import com.yihu.jw.hospital.family.dao.WlyyNatPatientFamilyMemberDao;
import com.yihu.jw.hospital.healthCare.YlzMedicailMxDao;
import com.yihu.jw.hospital.healthCare.YlzMedicailRelationDao;
import com.yihu.jw.hospital.httplog.dao.WlyyHttpLogDao;
@@ -95,7 +93,6 @@ import com.yihu.jw.restmodel.hospital.prescription.*;
import com.yihu.jw.restmodel.web.*;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import com.yihu.jw.rm.iot.IotRequestMapping;
import com.yihu.jw.sms.dao.BaseSmsTemplateDao;
import com.yihu.jw.sms.service.ZhongShanSMSService;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.common.LatitudeUtils;
@@ -116,7 +113,6 @@ import com.yihu.jw.wechat.service.BaseSensitiveFilterWordsService;
import com.yihu.jw.wechat.service.WxAccessTokenService;
import com.yihu.jw.yx.dao.YxTokenMappingDao;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.utils.security.MD5;
import com.ylzinfo.ehc.EhcHandler;
import com.ylzinfo.ehc.common.utils.DateUtils;
@@ -144,9 +140,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.print.DocFlavor;
import javax.validation.constraints.Null;
import java.beans.Transient;
import java.io.IOException;
import java.io.OutputStream;
import java.lang.Boolean;
@@ -7295,6 +7288,98 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        System.out.println("old"+(new Date().getTime()-statr));
        return envelop;
    }
    /**
     * 查找有专家问诊排班的医院
     */
    @Transactional(readOnly = true)
    public MixEnvelop findHospitalByZJ(String iswork, String orgName, String outpatientType,
                                       String workingTime, Integer page, Integer pagesize) {
        long statr = new Date().getTime();
        String sql = "SELECT " +
                " distinct o.name AS \"orgName\"," +
                " h.org_code AS \"orgCode\",o.photo AS \"photo\" " ;
        sql+=" FROM " +
                " base_doctor d " +
                " JOIN base_doctor_hospital h ON h.doctor_code = d.id " +
                " LEFT JOIN base_org o on o.code = h.org_code ";
        Map<String, Object> params = new HashedMap();
        Date date = new Date();
        if (StringUtils.isNotBlank(workingTime)) {
            sql += " JOIN wlyy_doctor_work_time wk on wk.doctor = d.id ";
        }
        sql += " WHERE h.del = '1' ";
        if (StringUtils.isNotBlank(iswork) && "1".equals(iswork)) {
            logger.info("iswork:" + iswork);
            sql += " AND (" +
                    " EXISTS ( " +
                    " SELECT " +
                    "  1 " +
                    " FROM " +
                    "  wlyy_doctor_work_time t " +
                    " WHERE " +
                    "  t.doctor = d.id " +
                    " AND t.start_time <=:startTime" +
                    " AND t.end_time >=:endTime" +
                    " ) OR " +
                    " d.consult_status = '1') ";
            params.put("startTime", date);
            params.put("endTime", date);
        }
        if (StringUtils.isNotBlank(orgName)) {
            sql += " AND h.org_name like :orgName";
            params.put("orgName", "%" + orgName + "%");
        }
        if (StringUtils.isNotBlank(outpatientType)) {
            if (outpatientType.contains("or")) {
                String[] outpatientTypeArray = outpatientType.split("or");
                sql += " AND ( ";
                for (int i = 0; i < outpatientTypeArray.length; i++) {
                    sql += " d.outpatient_type like'%" + outpatientTypeArray[i] + "%'";
                    if (i != outpatientTypeArray.length - 1) {
                        sql += " or ";
                    }
                }
                sql += " ) ";
            } else {
                sql += " AND d.outpatient_type like'%" + outpatientType + "%'";
            }
        } else {
            sql += " AND d.outpatient_type is not null ";
        }
        if (StringUtils.isNotBlank(workingTime)) {
            sql += " AND wk.work_date = :workingTime ";
            params.put("workingTime", workingTime);
        }
        sql +=" and d.del='1' and o.del='1' order by o.sort ";
        String sqlCount = "select count(1) as \"total\" from ( "+sql+" ) t";
        List<Map<String, Object>> list = hibenateUtils.createSQLQuery(sql, params, page, pagesize);
        List<Map<String, Object>> listCount = hibenateUtils.createSQLQuery(sqlCount, params);
        Long count = 0L;
        if(listCount!=null){
            //mysql 与 Oracle 聚合函数返回类型不一致，需要判断装换
            count = hibenateUtils.objTransformLong(listCount.get(0).get("total"));
        }
        logger.info("findHospitalByZJ end:" + DateUtil.dateToStr(new Date(), "yyyy-MM-dd HH:mm:ss:SSS"));
        logger.info("sql:" + sql);
        MixEnvelop envelop =new MixEnvelop();
        envelop.setDetailModelList(list);
        envelop.setTotalCount(count.intValue());
        envelop.setPageSize(pagesize);
        envelop.setCurrPage(page);
        System.out.println("old"+(new Date().getTime()-statr));
        return envelop;
    }
    /**
     * 获取常见疾病、热门部门、医生拒绝接诊原因 字典
     *

common/common-entity/sql/mysql关键字大全.sql

@@ -0,0 +1,930 @@
关键字
A
ACCESSIBLE
ACCOUNT
ACTION
ACTIVE
ADD
ADMIN
AFTER
AGAINST
AGGREGATE
ALGORITHM
ALL
ALTER
ALWAYS
ANALYSE
ANALYZE
AND
ANY
ARRAY
AS
ASC
ASCII
ASENSITIVE
AT
ATTRIBUTE
AUTHENTICATION
AUTOEXTEND_SIZE
AUTO_INCREMENT
AVG
AVG_ROW_LENGTH
B
BACKUP
BEFORE
BEGIN
BETWEEN
BIGINT
BINARY
BINLOG
BIT
BLOB
BLOCK
BOOL
BOOLEAN
BOTH
BTREE
BUCKETS
BY
BYTE
C
CACHE
CALL
CASCADE
CASCADED
CASE
CATALOG_NAME
CHAIN
CHALLENGE_RESPONSE
CHANGE
CHANGED
CHANNEL
CHAR
CHARACTER
CHARSET
CHECK
CHECKSUM
CIPHER
CLASS_ORIGIN
CLIENT
CLONE
CLOSE
COALESCE
CODE
COLLATE
COLLATION
COLUMN
COLUMNS
COLUMN_FORMAT
COLUMN_NAME
COMMENT
COMMIT
COMMITTED
COMPACT
COMPLETION
COMPONENT
COMPRESSED
COMPRESSION
CONCURRENT
CONDITION
CONNECTION
CONSISTENT
CONSTRAINT
CONSTRAINT_CATALOG
CONSTRAINT_NAME
CONSTRAINT_SCHEMA
CONTAINS
CONTEXT
CONTINUE
CONVERT
CPU
CREATE
CROSS
CUBE
CUME_DIST
CURRENT
CURRENT_DATE
CURRENT_TIME
CURRENT_TIMESTAMP
CURRENT_USER
CURSOR
CURSOR_NAME
D
DATA
DATABASE
DATABASES
DATAFILE
DATE
DATETIME
DAY
DAY_HOUR
DAY_MICROSECOND
DAY_MINUTE
DAY_SECOND
DEALLOCATE
DEC
DECIMAL
DECLARE
DEFAULT
DEFAULT_AUTH
DEFINER
DEFINITION
DELAYED
DELAY_KEY_WRITE
DELETE
DENSE_RANK
DESC
DESCRIBE
DESCRIPTION
DES_KEY_FILE
DETERMINISTIC
DIAGNOSTICS
DIRECTORY
DISABLE
DISCARD
DISK
DISTINCT
DISTINCTROW
DIV
DO
DOUBLE
DROP
DUAL
DUMPFILE
DUPLICATE
DYNAMIC
E
EACH
ELSE
ELSEIF
EMPTY
ENABLE
ENCLOSED
ENCRYPTION
END
ENDS
ENFORCED
ENGINE
ENGINES
ENGINE_ATTRIBUTE
ENUM
ERROR
ERRORS
ESCAPE
ESCAPED
EVENT
EVENTS
EVERY
EXCEPT
EXCHANGE
EXCLUDE
EXECUTE
EXISTS
EXIT
EXPANSION
EXPIRE
EXPLAIN
EXPORT
EXTENDED
EXTENT_SIZE
F
FACTOR
FAILED_LOGIN_ATTEMPTS
FALSE
FAST
FAULTS
FETCH
FIELDS
FILE
FILE_BLOCK_SIZE
FILTER
FINISH
FIRST
FIRST_VALUE
FIXED
FLOAT
FLOAT4
FLOAT8
FLUSH
FOLLOWING
FOLLOWS
FOR
FORCE
FOREIGN
FORMAT
FOUND
FROM
FULL
FULLTEXT
FUNCTION
G
GENERAL
GENERATED
GEOMCOLLECTION
GEOMETRY
GEOMETRYCOLLECTION
GET
GET_FORMAT
GET_MASTER_PUBLIC_KEY
GET_SOURCE_PUBLIC_KEY
GLOBAL
GRANT
GRANTS
GROUP
GROUPING
GROUPS
GROUP_REPLICATION
H
HANDLER
HASH
HAVING
HELP
HIGH_PRIORITY
HISTOGRAM
HISTORY
HOST
HOSTS
HOUR
HOUR_MICROSECOND
HOUR_MINUTE
HOUR_SECOND
I
IDENTIFIED
IF
IGNORE
IGNORE_SERVER_IDS
IMPORT
IN
INACTIVE
INDEX
INDEXES
INFILE
INITIAL
INITIAL_SIZE
INITIATE
INNER
INOUT
INSENSITIVE
INSERT
INSERT_METHOD
INSTALL
INSTANCE
INT
INT1
INT2
INT3
INT4
INT8
INTEGER
INTERVAL
INTO
INVISIBLE
INVOKER
IO
IO_AFTER_GTIDS
IO_BEFORE_GTIDS
IO_THREAD
IPC
IS
ISOLATION
ISSUER
ITERATE
J
JOIN
JSON
JSON_TABLE
JSON_VALUE
K
KEY
KEYRING
KEYS
KEY_BLOCK_SIZE
KILL
L
LAG
LANGUAGE
LAST
LAST_VALUE
LATERAL
LEAD
LEADING
LEAVE
LEAVES
LEFT
LESS
LEVEL
LIKE
LIMIT
LINEAR
LINES
LINESTRING
LIST
LOAD
LOCAL
LOCALTIME
LOCALTIMESTAMP
LOCK
LOCKED
LOCKS
LOGFILE
LOGS
LONG
LONGBLOB
LONGTEXT
LOOP
LOW_PRIORITY
M
MASTER
MASTER_AUTO_POSITION
MASTER_BIND
MASTER_COMPRESSION_ALGORITHMS
MASTER_CONNECT_RETRY
MASTER_DELAY
MASTER_HEARTBEAT_PERIOD
MASTER_HOST
MASTER_LOG_FILE
MASTER_LOG_POS
MASTER_PASSWORD
MASTER_PORT
MASTER_PUBLIC_KEY_PATH
MASTER_RETRY_COUNT
MASTER_SERVER_ID
MASTER_SSL
MASTER_SSL_CA
MASTER_SSL_CAPATH
MASTER_SSL_CERT
MASTER_SSL_CIPHER
MASTER_SSL_CRL
MASTER_SSL_CRLPATH
MASTER_SSL_KEY
MASTER_SSL_VERIFY_SERVER_CERT
MASTER_TLS_CIPHERSUITES
MASTER_TLS_VERSION
MASTER_USER
MASTER_ZSTD_COMPRESSION_LEVEL
MATCH
MAXVALUE
MAX_CONNECTIONS_PER_HOUR
MAX_QUERIES_PER_HOUR
MAX_ROWS
MAX_SIZE
MAX_UPDATES_PER_HOUR
MAX_USER_CONNECTIONS
MEDIUM
MEDIUMBLOB
MEDIUMINT
MEDIUMTEXT
MEMBER
MEMORY
MERGE
MESSAGE_TEXT
MICROSECOND
MIDDLEINT
MIGRATE
MINUTE
MINUTE_MICROSECOND
MINUTE_SECOND
MIN_ROWS
MOD
MODE
MODIFIES
MODIFY
MONTH
MULTILINESTRING
MULTIPOINT
MULTIPOLYGON
MUTEX
MYSQL_ERRNO
N
NAME
NAMES
NATIONAL
NATURAL
NCHAR
NDB
NDBCLUSTER
NESTED
NETWORK_NAMESPACE
NEVER
NEW
NEXT
NO
NODEGROUP
NONE
NOT
NOWAIT
NO_WAIT
NO_WRITE_TO_BINLOG
NTH_VALUE
NTILE
NULL
NULLS
NUMBER
NUMERIC
NVARCHAR
O
OF
OFF
OFFSET
OJ
OLD
ON
ONE
ONLY
OPEN
OPTIMIZE
OPTIMIZER_COSTS
OPTION
OPTIONAL
OPTIONALLY
OPTIONS
OR
ORDER
ORDINALITY
ORGANIZATION
OTHERS
OUT
OUTER
OUTFILE
OVER
OWNER
P
PACK_KEYS
PAGE
PARSER
PARTIAL
PARTITION
PARTITIONING
PARTITIONS
PASSWORD
PASSWORD_LOCK_TIME
PATH
PERCENT_RANK
PERSIST
PERSIST_ONLY
PHASE
PLUGIN
PLUGINS
PLUGIN_DIR
POINT
POLYGON
PORT
PRECEDES
PRECEDING
PRECISION
PREPARE
PRESERVE
PREV
PRIMARY
PRIVILEGES
PRIVILEGE_CHECKS_USER
PROCEDURE
PROCESS
PROCESSLIST
PROFILE
PROFILES
PROXY
PURGE
Q
QUARTER
QUERY
QUICK
R
RANDOM
RANGE
RANK
READ
READS
READ_ONLY
READ_WRITE
REAL
REBUILD
RECOVER
RECURSIVE
REDOFILE
REDO_BUFFER_SIZE
REDUNDANT
REFERENCE
REFERENCES
REGEXP
REGISTRATION
RELAY
RELAYLOG
RELAY_LOG_FILE
RELAY_LOG_POS
RELAY_THREAD
RELEASE
RELOAD
REMOTE
REMOVE
RENAME
REORGANIZE
REPAIR
REPEAT
REPEATABLE
REPLACE
REPLICA
REPLICAS
REPLICATE_DO_DB
REPLICATE_DO_TABLE
REPLICATE_IGNORE_DB
REPLICATE_IGNORE_TABLE
REPLICATE_REWRITE_DB
REPLICATE_WILD_DO_TABLE
REPLICATE_WILD_IGNORE_TABLE
REPLICATION
REQUIRE
REQUIRE_ROW_FORMAT
RESET
RESIGNAL
RESOURCE
RESPECT
RESTART
RESTORE
RESTRICT
RESUME
RETAIN
RETURN
RETURNED_SQLSTATE
RETURNING
RETURNS
REUSE
REVERSE
REVOKE
RIGHT
RLIKE
ROLE
ROLLBACK
ROLLUP
ROTATE
ROUTINE
ROW
ROWS
ROW_COUNT
ROW_FORMAT
ROW_NUMBER
RTREE
S
SAVEPOINT
SCHEDULE
SCHEMA
SCHEMAS
SCHEMA_NAME
SECOND
SECONDARY
SECONDARY_ENGINE
SECONDARY_ENGINE_ATTRIBUTE
SECONDARY_LOAD
SECONDARY_UNLOAD
SECOND_MICROSECOND
SECURITY
SELECT
    SENSITIVE
        SEPARATOR
    SERIAL
    SERIALIZABLE
    SERVER
    SESSION
SET
    SHARE
    SHOW
    SHUTDOWN
    SIGNAL
    SIGNED
    SIMPLE
    SKIP
    SLAVE
    SLOW
    SMALLINT
    SNAPSHOT
    SOCKET
    SOME
    SONAME
    SOUNDS
    SOURCE
    SOURCE_AUTO_POSITION
    SOURCE_BIND
    SOURCE_COMPRESSION_ALGORITHMS
    SOURCE_CONNECT_RETRY
    SOURCE_DELAY
    SOURCE_HEARTBEAT_PERIOD
    SOURCE_HOST
    SOURCE_LOG_FILE
    SOURCE_LOG_POS
    SOURCE_PASSWORD
    SOURCE_PORT
    SOURCE_PUBLIC_KEY_PATH
    SOURCE_RETRY_COUNT
    SOURCE_SSL
    SOURCE_SSL_CA
    SOURCE_SSL_CAPATH
    SOURCE_SSL_CERT
    SOURCE_SSL_CIPHER
    SOURCE_SSL_CRL
    SOURCE_SSL_CRLPATH
    SOURCE_SSL_KEY
    SOURCE_SSL_VERIFY_SERVER_CERT
    SOURCE_TLS_CIPHERSUITES
    SOURCE_TLS_VERSION
    SOURCE_USER
    SOURCE_ZSTD_COMPRESSION_LEVEL
    SPATIAL
    SPECIFIC
    SQL
    SQLEXCEPTION
    SQLSTATE
    SQLWARNING
    SQL_AFTER_GTIDS
    SQL_AFTER_MTS_GAPS
    SQL_BEFORE_GTIDS
    SQL_BIG_RESULT
    SQL_BUFFER_RESULT
    SQL_CACHE
    SQL_CALC_FOUND_ROWS
    SQL_NO_CACHE
    SQL_SMALL_RESULT
    SQL_THREAD
    SQL_TSI_DAY
    SQL_TSI_HOUR
    SQL_TSI_MINUTE
    SQL_TSI_MONTH
    SQL_TSI_QUARTER
    SQL_TSI_SECOND
    SQL_TSI_WEEK
    SQL_TSI_YEAR
    SRID
    SSL
    STACKED
START
    STARTING
    STARTS
    STATS_AUTO_RECALC
    STATS_PERSISTENT
    STATS_SAMPLE_PAGES
    STATUS
    STOP
    STORAGE
    STORED
    STRAIGHT_JOIN
    STREAM
    STRING
    SUBCLASS_ORIGIN
    SUBJECT
    SUBPARTITION
    SUBPARTITIONS
    SUPER
    SUSPEND
    SWAPS
    SWITCHES
    SYSTEM
    T
    TABLE
    TABLES
    TABLESPACE
    TABLE_CHECKSUM
    TABLE_NAME
    TEMPORARY
    TEMPTABLE
    TERMINATED
    TEXT
    THAN
    THEN
    THREAD_PRIORITY
    TIES
    TIME
    TIMESTAMP
    TIMESTAMPADD
    TIMESTAMPDIFF
    TINYBLOB
    TINYINT
    TINYTEXT
    TLS
    TO
    TRAILING
    TRANSACTION
    TRIGGER
    TRIGGERS
    TRUE
    TRUNCATE
    TYPE
    TYPES
    U
    UNBOUNDED
    UNCOMMITTED
    UNDEFINED
    UNDO
    UNDOFILE
    UNDO_BUFFER_SIZE
    UNICODE
    UNINSTALL
UNION
UNIQUE
UNKNOWN
UNLOCK
UNREGISTER
UNSIGNED
UNTIL
UPDATE
    UPGRADE
    USAGE
    USE
    USER
    USER_RESOURCES
    USE_FRM
    USING
    UTC_DATE
    UTC_TIME
    UTC_TIMESTAMP
    V
    VALIDATION
    VALUE
VALUES
    VARBINARY
    VARCHAR
    VARCHARACTER
    VARIABLES
    VARYING
    VCPU
    VIEW
    VIRTUAL
    VISIBLE
    W
    WAIT
    WARNINGS
    WEEK
    WEIGHT_STRING
    WHEN
WHERE
    WHILE
    WINDOW
WITH
    WITHOUT
    WORK
    WRAPPER
    WRITE
    X
    X509
    XA
    XID
    XML
    XOR
    Y
    YEAR
    YEAR_MONTH
    Z
    ZEROFILL
    ZONE
    A
    ACTIVE
    ADMIN
    ARRAY
    ATTRIBUTE
    AUTHENTICATION
    B
    BUCKETS
    C
    CHALLENGE_RESPONSE
    CLONE
    COMPONENT
    CUME_DIST
    D
    DEFINITION
    DENSE_RANK
    DESCRIPTION
    E
    EMPTY
    ENFORCED
    ENGINE_ATTRIBUTE
    EXCEPT
    EXCLUDE
    F
    FACTOR
    FAILED_LOGIN_ATTEMPTS
    FINISH
    FIRST_VALUE
    FOLLOWING
    G
    GEOMCOLLECTION
    GET_MASTER_PUBLIC_KEY
    GET_SOURCE_PUBLIC_KEY
    GROUPING
    GROUPS
    H
    HISTOGRAM
    HISTORY
    I
    INACTIVE
    INITIAL
    INITIATE
    INVISIBLE
    J
    JSON_TABLE
    JSON_VALUE
    K
    KEYRING
    L
    LAG
    LAST_VALUE
    LATERAL
    LEAD
    LOCKED
    M
    MASTER_COMPRESSION_ALGORITHMS
    MASTER_PUBLIC_KEY_PATH
    MASTER_TLS_CIPHERSUITES
    MASTER_ZSTD_COMPRESSION_LEVEL
    MEMBER
    N
    NESTED
    NETWORK_NAMESPACE
    NOWAIT
    NTH_VALUE
    NTILE
    NULLS
    O
    OF
    OFF
    OJ
    OLD
    OPTIONAL
    ORDINALITY
    ORGANIZATION
    OTHERS
    OVER
    P
    PASSWORD_LOCK_TIME
    PATH
    PERCENT_RANK
    PERSIST
    PERSIST_ONLY
    PRECEDING
    PRIVILEGE_CHECKS_USER
    PROCESS
    R
    RANDOM
    RANK
    RECURSIVE
    REFERENCE
    REGISTRATION
    REPLICA
    REPLICAS
    REQUIRE_ROW_FORMAT
    RESOURCE
    RESPECT
    RESTART
    RETAIN
    RETURNING
    REUSE
    ROLE
    ROW_NUMBER
    S
    SECONDARY
    SECONDARY_ENGINE
    SECONDARY_ENGINE_ATTRIBUTE
    SECONDARY_LOAD
    SECONDARY_UNLOAD
    SKIP
    SOURCE_AUTO_POSITION
    SOURCE_BIND
    SOURCE_COMPRESSION_ALGORITHMS
    SOURCE_CONNECT_RETRY
    SOURCE_DELAY
    SOURCE_HEARTBEAT_PERIOD
    SOURCE_HOST
    SOURCE_LOG_FILE
    SOURCE_LOG_POS
    SOURCE_PASSWORD
    SOURCE_PORT
    SOURCE_PUBLIC_KEY_PATH
    SOURCE_RETRY_COUNT
    SOURCE_SSL
    SOURCE_SSL_CA
    SOURCE_SSL_CAPATH
    SOURCE_SSL_CERT
    SOURCE_SSL_CIPHER
    SOURCE_SSL_CRL
    SOURCE_SSL_CRLPATH
    SOURCE_SSL_KEY
    SOURCE_SSL_VERIFY_SERVER_CERT
    SOURCE_TLS_CIPHERSUITES
    SOURCE_TLS_VERSION
    SOURCE_USER
    SOURCE_ZSTD_COMPRESSION_LEVEL
    SRID
    STREAM
    SYSTEM
    T
    THREAD_PRIORITY
    TIES
    TLS
    U
    UNBOUNDED
    UNREGISTER
    V
    VCPU
    VISIBLE
    W
    WINDOW
    Z
    ZONE

common/common-entity/sql/sql记录.txt

@@ -2431,6 +2431,8 @@ alter table wlyy_outpatient add column is_positive tinyint(1) DEFAULT NULL comme
alter table wlyy_patient_rehabilitation_plan add column patient_info_code varchar(50) DEFAULT NULL COMMENT '自动下转关联code';
alter table wlyy_patient_rehabilitation_plan add column third_org_code varchar(50) DEFAULT NULL COMMENT '自动下转的医院code';
-- 2023-02-13
ALTER TABLE base_doctor_daily_report_upload add column leader_comment VARCHAR(1000) COMMENT '上级点评'
-- 2023-01-29 wzn base
alter table base_doctor add column xgsz_charge_type varchar(50) DEFAULT NULL COMMENT '新冠首诊号别';
alter table wlyy_outpatient add column visit_type varchar(2) DEFAULT NULL COMMENT '就诊类型：1首诊2复诊';

common/common-entity/src/main/java/com/yihu/jw/entity/dailyReport/BaseDailyReportUploadDO.java

@@ -24,6 +24,7 @@ public class BaseDailyReportUploadDO extends UuidIdentityEntityWithOperator {
    private String reportDate; //上报日期
    private String totalHour;//上报时长
    private Integer niceWorkType;//点赞类型
    private String leaderComment;//上级点评
    /**
     * 非数据库字段
@@ -139,4 +140,12 @@ public class BaseDailyReportUploadDO extends UuidIdentityEntityWithOperator {
    public void setNiceWorkType(Integer niceWorkType) {
        this.niceWorkType = niceWorkType;
    }
    public String getLeaderComment() {
        return leaderComment;
    }
    public void setLeaderComment(String leaderComment) {
        this.leaderComment = leaderComment;
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/dailyReport/DailyReportUploadPoint.java

@@ -142,6 +142,8 @@ public class DailyReportUploadPoint extends EnvelopRestEndpoint {
                                   @RequestParam(value = "doctorId", required = true) String doctorId,
                                   @ApiParam(name = "reportID", value = "reportID")
                                   @RequestParam(value = "reportID", required = true) String reportID,
                                   @ApiParam(name = "leaderComment", value = "leaderComment")
                                   @RequestParam(value = "leaderComment", required = false) String leaderComment,
                                   @ApiParam(name = "jsonData", value = "事项信息实体")
                                   @RequestParam(value = "jsonData", required = false) String jsonData) {
        try {
@@ -149,7 +151,7 @@ public class DailyReportUploadPoint extends EnvelopRestEndpoint {
            if (StringUtils.isNoneBlank(jsonData)){
                healthUploadDOs = JSONArray.parseArray(jsonData,BaseDailyReportDetailDO.class);
            }
            BaseDailyReportUploadDO dailyReport = dailyReportUploadService.verifiedItem(doctorId,reportID,healthUploadDOs);
            BaseDailyReportUploadDO dailyReport = dailyReportUploadService.verifiedItem(doctorId,reportID,healthUploadDOs,leaderComment);
            return success(dailyReport);
        } catch (Exception e) {
            return failedObjEnvelopException(e);

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@@ -262,6 +262,30 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private HttpClientUtil httpClientUtil;
    @GetMapping(value = "findHospitalByZJ")
    @ApiOperation(value = "查找有专家问诊排班的医院", notes = "查找有专家问诊排班的医院")
    public MixEnvelop findHospitalByZJ(@ApiParam(name = "iswork", value = "是否过滤排班,1是")
                                                            @RequestParam(value = "iswork", required = true)String iswork,
                                                            @ApiParam(name = "orgName", value = "机构code", required = false)
                                                            @RequestParam(value = "orgName", required = false)String orgName,
                                                            @ApiParam(name = "outpatientType", value = "咨询类型zj 专家咨询")
                                                            @RequestParam(value = "outpatientType", required = false)String outpatientType,
                                                            @ApiParam(name = "workingTime", value = "排班时间YYYY-MM-DD")
                                                            @RequestParam(value = "workingTime", required = false)String workingTime,
                                                            @ApiParam(name = "page", value = "第几页")
                                                            @RequestParam(value = "page",required = false) Integer page,
                                                            @ApiParam(name = "pagesize", value = "分页大小")
                                                            @RequestParam(value = "pagesize",required = false) Integer pagesize
    ){
        try {
            logger.info("findHospitalByZJ start:"+ DateUtil.dateToStr(new Date(),"yyyy-MM-dd HH:mm:ss:SSS"));
            return prescriptionService.findHospitalByZJ(iswork,orgName,
                    outpatientType,workingTime,page,pagesize);
        } catch (Exception e){
            return  failedMixEnvelopException(e);
        }
    }
    @GetMapping(value = BaseHospitalRequestMapping.PatientNoLogin.findDoctorByHospitalAndDiseaseAndDept)
    @ApiOperation(value = "根据疾病名称，热门部门查询医生", notes = "根据疾病名称，热门部门查询医生")