|
@@ -1,21 +1,18 @@
|
|
|
package com.diagbot.facade.data;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.diagbot.dto.AnalyzeRunDTO;
|
|
|
import com.diagbot.dto.RespDTO;
|
|
|
import com.diagbot.dto.data.AHomePageDTO;
|
|
|
+import com.diagbot.entity.HomeOperationInfo;
|
|
|
import com.diagbot.entity.HomePage;
|
|
|
+import com.diagbot.enums.IsDeleteEnum;
|
|
|
import com.diagbot.facade.BehospitalInfoFacade;
|
|
|
import com.diagbot.service.impl.HomePageServiceImpl;
|
|
|
-import com.diagbot.util.BeanUtil;
|
|
|
-import com.diagbot.util.DateUtil;
|
|
|
-import com.diagbot.util.ReadProperties;
|
|
|
-import com.diagbot.util.TZDBConn;
|
|
|
+import com.diagbot.util.*;
|
|
|
import com.diagbot.vo.AnalyzeRunVO;
|
|
|
-import com.diagbot.vo.data.AHomeDiagnoseVO;
|
|
|
-import com.diagbot.vo.data.AHomeOperationVO;
|
|
|
-import com.diagbot.vo.data.AHomePageIngVO;
|
|
|
-import com.diagbot.vo.data.AHomePageVO;
|
|
|
+import com.diagbot.vo.data.*;
|
|
|
import com.google.common.collect.Lists;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Qualifier;
|
|
@@ -141,7 +138,20 @@ public class AHomePageFacade extends HomePageServiceImpl{
|
|
|
//初始化入参
|
|
|
HomePage homePage=new HomePage();
|
|
|
BeanUtil.copyProperties(s,homePage);
|
|
|
- homePage.setBirthday(DateUtil.parseDate(s.getBirthday()));
|
|
|
+ if(StringUtil.isNotBlank(s.getBirthday())){
|
|
|
+ homePage.setBirthday(DateUtil.parseDate(s.getBirthday()));
|
|
|
+ }
|
|
|
+ if(StringUtil.isNotBlank(s.getBehospitalDate())){
|
|
|
+ homePage.setBehospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getBehospitalDate(),"yyyy/MM/dd HH:mm:ss"))));
|
|
|
+ }
|
|
|
+ if(StringUtil.isNotBlank(s.getLeaveHospitalDate())){
|
|
|
+ //homePage.setLeaveHospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getLeaveHospitalDate(),"yyyy/MM/dd HH:mm:ss"))));
|
|
|
+ homePage.setLeaveHospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getLeaveHospitalDate(),"yyyy/MM/dd HH:mm"))));
|
|
|
+ }
|
|
|
+ if(StringUtil.isNotBlank(s.getQcDate())){
|
|
|
+ //homePage.setQcDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getQcDate(),"yyyy/MM/dd HH:mm:ss"))));
|
|
|
+ homePage.setQcDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getQcDate(),"yyyy/MM/dd"))));
|
|
|
+ }
|
|
|
homePageList.add(homePage);
|
|
|
|
|
|
//初始化诊断和手术,并同步到数据库
|
|
@@ -224,10 +234,20 @@ public class AHomePageFacade extends HomePageServiceImpl{
|
|
|
//初始化入参
|
|
|
HomePage homePage=new HomePage();
|
|
|
BeanUtil.copyProperties(s,homePage);
|
|
|
- homePage.setBirthday(DateUtil.parseDate(s.getBirthday()));
|
|
|
- homePage.setBehospitalDate(DateUtil.parseDateTime(s.getBehospitalDate()));
|
|
|
- homePage.setLeaveHospitalDate(DateUtil.parseDateTime(s.getLeaveHospitalDate()));
|
|
|
- homePage.setQcDate(DateUtil.parseDateTime(s.getQcDate()));
|
|
|
+ if(StringUtil.isNotBlank(s.getBirthday())){
|
|
|
+ homePage.setBirthday(DateUtil.parseDate(s.getBirthday()));
|
|
|
+ }
|
|
|
+ if(StringUtil.isNotBlank(s.getBehospitalDate())){
|
|
|
+ homePage.setBehospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getBehospitalDate(),"yyyy/MM/dd HH:mm:ss"))));
|
|
|
+ }
|
|
|
+ if(StringUtil.isNotBlank(s.getLeaveHospitalDate())){
|
|
|
+ //homePage.setLeaveHospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getLeaveHospitalDate(),"yyyy/MM/dd HH:mm:ss"))));
|
|
|
+ homePage.setLeaveHospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getLeaveHospitalDate(),"yyyy/MM/dd HH:mm"))));
|
|
|
+ }
|
|
|
+ if(StringUtil.isNotBlank(s.getQcDate())){
|
|
|
+ //homePage.setQcDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getQcDate(),"yyyy/MM/dd HH:mm:ss"))));
|
|
|
+ homePage.setQcDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getQcDate(),"yyyy/MM/dd"))));
|
|
|
+ }
|
|
|
homePageList.add(homePage);
|
|
|
});
|
|
|
execute(homePageList);
|
|
@@ -267,4 +287,26 @@ public class AHomePageFacade extends HomePageServiceImpl{
|
|
|
homePageService.updateBatchByKey(updateE);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
|
|
|
+ //验证数据是否存在
|
|
|
+ if(StringUtil.isNotBlank(aDeleteFlagVO.getHomePageId())) {
|
|
|
+ return RespDTO.onError("请输入病案首页编号!");
|
|
|
+ }else if(aDeleteFlagVO.getHospitalId()==null){
|
|
|
+ return RespDTO.onError("请输入医院编码!");
|
|
|
+ }else if(StringUtil.isNotBlank(aDeleteFlagVO.getBehospitalCode())){
|
|
|
+ return RespDTO.onError("请输入病人住院编码!");
|
|
|
+ }else {
|
|
|
+ UpdateWrapper<HomePage> updateWrapper=new UpdateWrapper<>();
|
|
|
+ updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
|
|
|
+ .eq("hospital_id", aDeleteFlagVO.getHospitalId())
|
|
|
+ .eq("operation_order_no", aDeleteFlagVO.getOperationOrderNo())
|
|
|
+ .eq("is_deleted",IsDeleteEnum.N)
|
|
|
+ .set("is_deleted",IsDeleteEnum.Y)
|
|
|
+ .set("gmt_modified", DateUtil.now());
|
|
|
+
|
|
|
+ Boolean flag=update(new HomePage(),updateWrapper);
|
|
|
+ return RespDTO.onSuc(flag);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|