代码修改

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

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.ehr.constants.ErrorCode;
import com.yihu.jw.entity.ehr.patient.DemographicId;
import com.yihu.jw.basic.patient.service.DemographicService;
import com.yihu.jw.entity.ehr.user.Doctors;
import com.yihu.jw.entity.ehr.user.RoleUser;
@@ -23,7 +22,7 @@ import com.yihu.jw.restmodel.ehr.patient.MPatientInfo;
import com.yihu.jw.util.date.DateTimeUtil;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.util.log.LogService;
import com.yihu.jw.util.common.LogService;
import com.yihu.utils.date.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -33,7 +32,6 @@ import org.csource.common.MyException;
import org.json.JSONObject;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;

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

@@ -5,7 +5,7 @@ import com.yihu.jw.basic.report.dao.XJsonReportRepository;
import com.yihu.jw.entity.ehr.report.JsonReport;
import com.yihu.fastdfs.FastDFSUtil;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.util.log.LogService;
import com.yihu.jw.util.common.LogService;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.hibernate.HibernateException;
import org.hibernate.Query;

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

@@ -33,7 +33,7 @@ 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.entity.ehr.id.BizObject;
import com.yihu.jw.util.log.LogService;
import com.yihu.jw.util.common.LogService;
import com.yihu.jw.restmodel.web.Envelop;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

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

@@ -1,7 +1,7 @@
package com.yihu.jw.basic.util;
import com.yihu.jw.util.compress.Zipper;
import com.yihu.jw.util.log.LogService;
import com.yihu.jw.util.common.LogService;
import org.apache.tomcat.util.http.fileupload.FileUtils;
import java.io.*;