|
|
@@ -28,7 +28,6 @@ import com.diagbot.entity.HomeDiagnoseInfo;
|
|
|
import com.diagbot.entity.HomeOperationInfo;
|
|
|
import com.diagbot.entity.HomePage;
|
|
|
import com.diagbot.entity.MedicalRecord;
|
|
|
-import com.diagbot.entity.SysUserDept;
|
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
|
import com.diagbot.exception.CommonException;
|
|
|
@@ -49,7 +48,6 @@ import com.diagbot.vo.AnalyzeRunVO;
|
|
|
import com.diagbot.vo.AnalyzeVO;
|
|
|
import com.diagbot.vo.BehospitalPageVO;
|
|
|
import com.diagbot.vo.ExportQcresultVO;
|
|
|
-import com.diagbot.vo.FilterVO;
|
|
|
import com.diagbot.vo.GetDetailVO;
|
|
|
import com.diagbot.vo.MedrecVo;
|
|
|
import com.diagbot.vo.QcResultAlgQueryVO;
|
|
|
@@ -62,7 +60,6 @@ import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
-import java.text.DateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.Date;
|
|
|
@@ -605,7 +602,11 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
if (map.containsKey(objKey)) {
|
|
|
if (firstPageDate.contains(objKey)) {
|
|
|
Date date = (Date) objectMap.get(objKey);
|
|
|
- content.put(map.get(objKey), DateUtil.formatDateTime(date).replaceAll("null", ""));
|
|
|
+ if ("birthday".equals(objKey)) {
|
|
|
+ content.put(map.get(objKey), DateUtil.formatDate(date));
|
|
|
+ } else {
|
|
|
+ content.put(map.get(objKey), DateUtil.formatDateTime(date));
|
|
|
+ }
|
|
|
} else {
|
|
|
content.put(map.get(objKey), String.valueOf(objectMap.get(objKey)).replaceAll("null", ""));
|
|
|
}
|
wangfeng