|
@@ -25,6 +25,7 @@ import com.lantone.daqe.entity.BlocklossResult;
|
|
import com.lantone.daqe.entity.HomePage;
|
|
import com.lantone.daqe.entity.HomePage;
|
|
import com.lantone.daqe.entity.MedicalRecord;
|
|
import com.lantone.daqe.entity.MedicalRecord;
|
|
import com.lantone.daqe.entity.MedicalRecordContent;
|
|
import com.lantone.daqe.entity.MedicalRecordContent;
|
|
|
|
+import com.lantone.daqe.enums.DataSaveUrlEnum;
|
|
import com.lantone.daqe.enums.LossStatusEnum;
|
|
import com.lantone.daqe.enums.LossStatusEnum;
|
|
import com.lantone.daqe.enums.LossTypeEnum;
|
|
import com.lantone.daqe.enums.LossTypeEnum;
|
|
import com.lantone.daqe.enums.LossWayEnum;
|
|
import com.lantone.daqe.enums.LossWayEnum;
|
|
@@ -136,7 +137,7 @@ public class BlockLossManagementFacade {
|
|
|
|
|
|
//获取操作记录数据
|
|
//获取操作记录数据
|
|
//病历数据
|
|
//病历数据
|
|
- dataCompareVO.setOperationUrl("save/saveBehospitalCode");
|
|
|
|
|
|
+ dataCompareVO.setOperationUrl(DataSaveUrlEnum.BEHOSPITAL_INFO.getKey());
|
|
List<GetOperationLogDTO> behospitalCodeLogs = getOperationLogs(dataCompareVO);
|
|
List<GetOperationLogDTO> behospitalCodeLogs = getOperationLogs(dataCompareVO);
|
|
//病案首页数据
|
|
//病案首页数据
|
|
List<GetOperationLogDTO> homePageLogs = new ArrayList<>();
|
|
List<GetOperationLogDTO> homePageLogs = new ArrayList<>();
|
|
@@ -151,10 +152,10 @@ public class BlockLossManagementFacade {
|
|
logCodes = behospitalCodeLogs.stream().map(GetOperationLogDTO::getBehospitalCode).collect(Collectors.toList());
|
|
logCodes = behospitalCodeLogs.stream().map(GetOperationLogDTO::getBehospitalCode).collect(Collectors.toList());
|
|
dataCompareVO.setBehospitalCodes(logCodes);
|
|
dataCompareVO.setBehospitalCodes(logCodes);
|
|
//病案首页数据
|
|
//病案首页数据
|
|
- dataCompareVO.setOperationUrl("save/saveHomePages");
|
|
|
|
|
|
+ dataCompareVO.setOperationUrl(DataSaveUrlEnum.HOME_PAGE.getKey());
|
|
homePageLogs = removeRepeat(getOperationLogs(dataCompareVO), "homePageId");
|
|
homePageLogs = removeRepeat(getOperationLogs(dataCompareVO), "homePageId");
|
|
//文书数据
|
|
//文书数据
|
|
- dataCompareVO.setOperationUrl("save/saveRecs");
|
|
|
|
|
|
+ dataCompareVO.setOperationUrl(DataSaveUrlEnum.MEDICAL_RECORD.getKey());
|
|
recLogs = removeRepeat(getOperationLogs(dataCompareVO), "recTitle");
|
|
recLogs = removeRepeat(getOperationLogs(dataCompareVO), "recTitle");
|
|
}
|
|
}
|
|
|
|
|
|
@@ -624,9 +625,9 @@ public class BlockLossManagementFacade {
|
|
* @Return com.lantone.daqe.dto.BlockLossTypeGatherDTO
|
|
* @Return com.lantone.daqe.dto.BlockLossTypeGatherDTO
|
|
*/
|
|
*/
|
|
public BlockLossTypeGatherDTO blockLossTypeGather(BlockLossTypeGatherVO blockLossTypeGatherVO) {
|
|
public BlockLossTypeGatherDTO blockLossTypeGather(BlockLossTypeGatherVO blockLossTypeGatherVO) {
|
|
- blockLossTypeGatherVO.setOperationUrls(Lists.newArrayList("save/saveBehospitalCode",
|
|
|
|
- "save/saveHomePages",
|
|
|
|
- "save/saveRecs"));
|
|
|
|
|
|
+ blockLossTypeGatherVO.setOperationUrls(Lists.newArrayList(DataSaveUrlEnum.BEHOSPITAL_INFO.getKey(),
|
|
|
|
+ DataSaveUrlEnum.HOME_PAGE.getKey(),
|
|
|
|
+ DataSaveUrlEnum.MEDICAL_RECORD.getKey()));
|
|
|
|
|
|
DataCompareVO dataCompareVO = new DataCompareVO();
|
|
DataCompareVO dataCompareVO = new DataCompareVO();
|
|
dataCompareVO.setStartDate(blockLossTypeGatherVO.getStartDate());
|
|
dataCompareVO.setStartDate(blockLossTypeGatherVO.getStartDate());
|
|
@@ -640,7 +641,7 @@ public class BlockLossManagementFacade {
|
|
|
|
|
|
//获取该时间段的日志数量
|
|
//获取该时间段的日志数量
|
|
//病历数据
|
|
//病历数据
|
|
- dataCompareVO.setOperationUrl("save/saveBehospitalCode");
|
|
|
|
|
|
+ dataCompareVO.setOperationUrl(DataSaveUrlEnum.BEHOSPITAL_INFO.getKey());
|
|
List<GetOperationLogDTO> behospitalCodeLogs = getOperationLogs(dataCompareVO);
|
|
List<GetOperationLogDTO> behospitalCodeLogs = getOperationLogs(dataCompareVO);
|
|
//病案首页数据
|
|
//病案首页数据
|
|
List<GetOperationLogDTO> homePageLogs = new ArrayList<>();
|
|
List<GetOperationLogDTO> homePageLogs = new ArrayList<>();
|
|
@@ -651,10 +652,10 @@ public class BlockLossManagementFacade {
|
|
List<String> logCodes = behospitalCodeLogs.stream().map(GetOperationLogDTO::getBehospitalCode).collect(Collectors.toList());
|
|
List<String> logCodes = behospitalCodeLogs.stream().map(GetOperationLogDTO::getBehospitalCode).collect(Collectors.toList());
|
|
dataCompareVO.setBehospitalCodes(logCodes);
|
|
dataCompareVO.setBehospitalCodes(logCodes);
|
|
//病案首页数据
|
|
//病案首页数据
|
|
- dataCompareVO.setOperationUrl("save/saveHomePages");
|
|
|
|
|
|
+ dataCompareVO.setOperationUrl(DataSaveUrlEnum.HOME_PAGE.getKey());
|
|
homePageLogs = getOperationLogs(dataCompareVO);
|
|
homePageLogs = getOperationLogs(dataCompareVO);
|
|
//文书数据
|
|
//文书数据
|
|
- dataCompareVO.setOperationUrl("save/saveRecs");
|
|
|
|
|
|
+ dataCompareVO.setOperationUrl(DataSaveUrlEnum.MEDICAL_RECORD.getKey());
|
|
recLogs = getOperationLogs(dataCompareVO);
|
|
recLogs = getOperationLogs(dataCompareVO);
|
|
Integer logNum = logCodes.size() + homePageLogs.size() + recLogs.size();
|
|
Integer logNum = logCodes.size() + homePageLogs.size() + recLogs.size();
|
|
blockLossTypeGatherDTO.setLogNum(logNum);
|
|
blockLossTypeGatherDTO.setLogNum(logNum);
|
|
@@ -662,6 +663,7 @@ public class BlockLossManagementFacade {
|
|
|
|
|
|
//获取该时间段的实际数量
|
|
//获取该时间段的实际数量
|
|
List<String> codes = behospitalInfoFacade.list(new QueryWrapper<BehospitalInfo>()
|
|
List<String> codes = behospitalInfoFacade.list(new QueryWrapper<BehospitalInfo>()
|
|
|
|
+ .eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
.eq("hospital_id", SysUserUtils.getCurrentHospitalId() != null ? SysUserUtils.getCurrentHospitalId() : 0)
|
|
.eq("hospital_id", SysUserUtils.getCurrentHospitalId() != null ? SysUserUtils.getCurrentHospitalId() : 0)
|
|
.ge(blockLossTypeGatherVO.getStartDate() != null, "behospital_date", blockLossTypeGatherVO.getStartDate())
|
|
.ge(blockLossTypeGatherVO.getStartDate() != null, "behospital_date", blockLossTypeGatherVO.getStartDate())
|
|
.le(blockLossTypeGatherVO.getEndDate() != null, "behospital_date", blockLossTypeGatherVO.getEndDate()))
|
|
.le(blockLossTypeGatherVO.getEndDate() != null, "behospital_date", blockLossTypeGatherVO.getEndDate()))
|