代码修改

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/controller/PatientEndPoint.java

@@ -23,7 +23,7 @@ import com.yihu.jw.util.date.DateTimeUtil;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.util.common.LogService;
import com.yihu.utils.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

svr/svr-basic/src/main/java/com/yihu/jw/basic/portal/controller/PortalFeedbackEndPoint.java

@@ -8,7 +8,7 @@ import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.restmodel.ehr.portal.MPortalFeedback;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.utils.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

svr/svr-basic/src/main/java/com/yihu/jw/basic/portal/service/PortalMessageRemindService.java

@@ -6,7 +6,7 @@ import com.yihu.jw.entity.ehr.portal.ProtalMessageRemind;
import com.yihu.jw.mysql.model.DataList;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.service.DBQuery;
import com.yihu.utils.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -96,7 +96,7 @@ public class PortalMessageRemindService extends BaseJpaService<ProtalMessageRemi
     * @return
     */
    public DataList listMessageRemindValue(String appId, String toUserId, String typeId, String type, int page, int size, String notifie) throws Exception {
        String date = DateUtil.getNowDate(DateUtil.DEFAULT_DATE_YMD_FORMAT);
        String date = DateUtil.getStringDateShort();
        String notifieSql = "";
        if (StringUtils.isNotEmpty(notifie)) {
            notifieSql = " AND p.notifie_flag = '" + notifie + "' ";

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/controller/TjQuotaEndPoint.java

@@ -15,7 +15,7 @@ import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.svrBasic.ApiVersion;
import com.yihu.jw.rm.svrBasic.ServiceApi;
import com.yihu.utils.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjQuotaLogService.java

@@ -4,7 +4,7 @@ import com.yihu.jw.basic.hibernate.HibenateUtils;
import com.yihu.jw.basic.quota.dao.XTjQuotaLogRepository;
import com.yihu.jw.entity.ehr.quota.TjQuotaLog;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.utils.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjQuotaService.java

@@ -5,7 +5,7 @@ import com.yihu.jw.entity.ehr.quota.TjQuota;
import com.yihu.jw.entity.ehr.quota.TjQuotaDataSave;
import com.yihu.jw.entity.ehr.quota.TjQuotaDataSource;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.utils.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.Session;

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/controller/QcDailyReportEndPoint.java

@@ -13,7 +13,7 @@ import com.yihu.jw.entity.ehr.report.QcDailyReport;
import com.yihu.jw.entity.ehr.report.QcDailyReportDetail;
import com.yihu.jw.restmodel.ehr.report.MQcDailyReport;
import com.yihu.jw.restmodel.ehr.report.MQcDailyReportDetail;
import com.yihu.utils.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/controller/QcDailyReportMetadataEndPoint.java

@@ -9,7 +9,7 @@ import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.entity.ehr.report.QcDailyReportMetadata;
import com.yihu.jw.restmodel.ehr.report.MQcDailyReportMetadata;
import com.yihu.utils.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/controller/QcQuotaResultEndPoint.java

@@ -13,7 +13,7 @@ import com.yihu.jw.entity.ehr.report.QcQuotaResult;
import com.yihu.jw.restmodel.ehr.report.MQcDailyReportQuotaResult;
import com.yihu.jw.restmodel.ehr.report.MQcDailyReportResultDetail;
import com.yihu.jw.util.date.DateTimeUtil;
import com.yihu.utils.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/scheduler/QcReportScheduler.java

@@ -5,7 +5,7 @@
//import com.yihu.jw.basic.report.service.QuotaStatisticsService;
//import com.yihu.jw.basic.util.CopyFileUtil;
//import com.yihu.jw.entity.ehr.report.JsonReport;
//import com.yihu.utils.date.DateUtil;
//import com.yihu.jw.util.date.DateUtil;
//import org.apache.tomcat.util.http.fileupload.FileUtils;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/service/QcDailyReportDatasetsService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.report.service;
import com.yihu.jw.basic.report.dao.XQcDailyReportDatasetsRepository;
import com.yihu.jw.entity.ehr.report.QcDailyReportDatasets;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.utils.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/service/QcDailyReportResolveService.java

@@ -14,7 +14,7 @@
//import com.yihu.jw.restmodel.ehr.report.json.*;
//
//import com.yihu.jw.restmodel.web.Envelop;
//import com.yihu.utils.date.DateUtil;
//import com.yihu.jw.util.date.DateUtil;
//import org.apache.commons.lang.StringUtils;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/service/QcDailyReportService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.report.service;
import com.yihu.jw.basic.report.dao.XQcDailyReportRepository;
import com.yihu.jw.entity.ehr.report.QcDailyReport;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.utils.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;
import org.apache.commons.lang.StringUtils;
import org.hibernate.Query;
import org.hibernate.Session;

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/service/QuotaStatisticsService.java

@@ -5,7 +5,7 @@ import com.yihu.jw.entity.ehr.org.Organization;
import com.yihu.jw.basic.org.service.OrgService;
import com.yihu.jw.entity.ehr.address.Address;
import com.yihu.jw.entity.ehr.report.QcQuotaResult;
import com.yihu.utils.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/document/CDADocumentService.java

@@ -9,7 +9,7 @@ import com.yihu.jw.basic.standard.model.CDADocument;
import com.yihu.jw.basic.standard.model.Result;
import com.yihu.jw.basic.standard.service.bo.StandardVersion;
import com.yihu.jw.util.sql.SqlCreator;
import com.yihu.utils.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;
import org.hibernate.Query;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@@ -56,7 +56,7 @@ public class CDADocumentService extends SQLGeneralDAO {
        try {
            StandardVersion version = new StandardVersion(adapterVersion);
            ObjectMapper mapper = new ObjectMapper();
            mapper.setDateFormat(new SimpleDateFormat(DateUtil.DEFAULT_YMDHMSDATE_FORMAT));
            mapper.setDateFormat(new SimpleDateFormat(DateUtil.YYYY_MM_DD_HH_MM_SS));
            JsonNode jsonNode = mapper.readTree(mapper.writeValueAsString(obj));
            SqlCreator sqlCreator = new SqlCreator(BaseCDADocument.class);
            String sql = sqlCreator.updateDataByTableKey(version.getCDATableName(), jsonNode);

svr/svr-basic/src/main/java/com/yihu/jw/basic/user/controller/DoctorEndPoint.java

@@ -25,7 +25,7 @@ import com.yihu.jw.restmodel.ehr.org.MOrgDeptJson;
import com.yihu.jw.restmodel.ehr.user.MDoctor;
import com.yihu.jw.entity.ehr.id.BizObject;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.utils.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

svr/svr-basic/src/main/java/com/yihu/jw/basic/user/controller/UserEndPoint.java

@@ -38,12 +38,10 @@ import com.yihu.fastdfs.FastDFSUtil;
import com.yihu.jw.restmodel.ehr.org.MJkzlOrgMemberRelation;
import com.yihu.jw.restmodel.ehr.user.MH5Handshake;
import com.yihu.jw.restmodel.ehr.user.MUser;
import com.yihu.utils.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.entity.ehr.id.BizObject;
import com.yihu.jw.util.common.LogService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.utils.network.HttpResponse;
import com.yihu.utils.network.HttpUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -52,7 +50,6 @@ import org.apache.commons.lang.time.DateFormatUtils;
import org.csource.common.MyException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/user/service/DoctorService.java

@@ -12,7 +12,7 @@ import com.yihu.jw.entity.ehr.user.Doctors;
import com.yihu.jw.entity.ehr.user.User;
import com.yihu.jw.entity.ehr.patient.DemographicInfo;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.utils.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Query;

svr/svr-basic/src/main/java/com/yihu/jw/basic/user/service/UserService.java

@@ -8,7 +8,7 @@ import com.yihu.jw.entity.ehr.user.UserTypeRoles;
import com.yihu.jw.entity.ehr.patient.DemographicInfo;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.entity.ehr.user.Doctors;
import com.yihu.utils.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;
import org.apache.commons.codec.digest.DigestUtils;
import org.hibernate.Query;
import org.hibernate.SQLQuery;

svr/svr-basic/src/main/java/com/yihu/jw/basic/user/service/UserTelVerificationService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.user.service;
import com.yihu.jw.basic.user.dao.XUserTelVerificationRepository;
import com.yihu.jw.entity.ehr.user.UserTelVerification;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.utils.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -72,7 +72,7 @@ public class UserTelVerificationService extends BaseJpaService<UserTelVerificati
            }
            //验证码有有效性验证
            if (telVerification.getEffectivePeriod() != null) {
                int validationResult = telVerification.getEffectivePeriod().compareTo(DateUtil.getSysDate());
                int validationResult = telVerification.getEffectivePeriod().compareTo(DateUtil.getNowDate());
                //验证码未超期且验证通过，则返回成功
                if (validationResult > 0 && (verificationCode.toLowerCase()).equals(telVerification.getVerificationCode().toString().toLowerCase())) {
                    return true;

svr/svr-basic/src/main/java/com/yihu/jw/basic/util/QcMetadataParser.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.util;
import com.fasterxml.jackson.databind.JsonNode;
import com.yihu.jw.restmodel.ehr.report.json.QcDailyMetadataModel;
import com.yihu.utils.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;
import org.springframework.stereotype.Component;
import java.util.ArrayList;