@ -20,6 +20,7 @@ import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper ;
import com.google.common.base.Function ;
import lombok.extern.slf4j.Slf4j ;
import org.apache.commons.collections4.ListUtils ;
import org.apache.commons.lang3.StringUtils ;
import org.springframework.beans.factory.annotation.Autowired ;
import org.springframework.beans.factory.annotation.Value ;
@ -33,7 +34,6 @@ import java.text.DateFormat;
import java.text.ParseException ;
import java.text.SimpleDateFormat ;
import java.util.* ;
import java.util.stream.Collectors ;
@Slf4j
@Service
@ -193,7 +193,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
setNameAndPrintFlagNew ( archiveMasterVo , list ) ;
List < Emr_Dictionary > dicList = emrDictionaryService . dicByTypeCode ( dic ) ;
//转换科室
Map < String , Emr_Dictionary > codeMap = ListUtil s . toMap ( dicList , Emr_Dictionary : : getCode ) ;
Map < String , Emr_Dictionary > codeMap = ListUtil . toMap ( dicList , Emr_Dictionary : : getCode ) ;
Setters . < Archive_Master_Vo > instance ( ) . list ( list ) . cycleSetProperties ( p - > {
String deptCode = p . getDeptName ( ) ;
if ( StringUtils . isNotBlank ( deptCode ) & & codeMap . containsKey ( deptCode ) ) {
@ -202,13 +202,13 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
}
} ) ;
//masterIds集合
List < String > masterIds = ListUtil s . distinctSelect ( list , Archive_Master_Vo : : getId ) ;
List < String > masterIds = ListUtil . distinctSelect ( list , Archive_Master_Vo : : getId ) ;
//转成逗号拼接
String ids = String . join ( "," , masterIds ) ;
//获取医生缺陷数量
List < Archive_Master_Vo > doctorDefectNum = archiveMasterMapper . getDoctorDefectNum ( ids ) ;
//医生是否有缺陷
Map < String , Archive_Master_Vo > doctorMap = ListUtil s . toMap ( doctorDefectNum , Archive_Master_Vo : : getArchiveDetailId ) ;
Map < String , Archive_Master_Vo > doctorMap = ListUtil . toMap ( doctorDefectNum , Archive_Master_Vo : : getArchiveDetailId ) ;
Setters . < Archive_Master_Vo > instance ( ) . list ( list ) . cycleSetProperties ( p - > {
String doctorId = p . getId ( ) ;
if ( doctorMap . containsKey ( doctorId ) ) {
@ -220,7 +220,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
//获取护士缺陷数量
List < Archive_Master_Vo > nurseDefectNum = archiveMasterMapper . getNurseDefectNum ( ids ) ;
//护士是否有缺陷
Map < String , Archive_Master_Vo > nurseMap = ListUtil s . toMap ( nurseDefectNum , Archive_Master_Vo : : getArchiveDetailId ) ;
Map < String , Archive_Master_Vo > nurseMap = ListUtil . toMap ( nurseDefectNum , Archive_Master_Vo : : getArchiveDetailId ) ;
//判断是否有缺陷就填入
Setters . < Archive_Master_Vo > instance ( ) . list ( list ) . cycleSetProperties ( p - > {
String nurseId = p . getId ( ) ;
@ -279,7 +279,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
dic . setTypecode ( "dept_code" ) ;
List < Emr_Dictionary > dicList = emrDictionaryService . dicByTypeCode ( dic ) ;
//转换科室
Map < String , Emr_Dictionary > codeMap = ListUtil s . toMap ( dicList , Emr_Dictionary : : getCode ) ;
Map < String , Emr_Dictionary > codeMap = ListUtil . toMap ( dicList , Emr_Dictionary : : getCode ) ;
Setters . < Archive_Master_Vo > instance ( ) . list ( list ) . cycleSetProperties ( p - > {
String deptCode = p . getDeptName ( ) ;
String deptAdmissionCode = p . getDeptAdmissionTo ( ) ;
@ -293,13 +293,13 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
}
} ) ;
//masterIds集合
List < String > masterIds = ListUtil s . distinctSelect ( list , Archive_Master_Vo : : getId ) ;
List < String > masterIds = ListUtil . distinctSelect ( list , Archive_Master_Vo : : getId ) ;
//转成逗号拼接
String ids = String . join ( "," , masterIds ) ;
//获取医生缺陷数量
List < Archive_Master_Vo > doctorDefectNum = archiveMasterMapper . getDoctorDefectNum ( ids ) ;
//医生是否有缺陷
Map < String , Archive_Master_Vo > doctorMap = ListUtil s . toMap ( doctorDefectNum , Archive_Master_Vo : : getArchiveDetailId ) ;
Map < String , Archive_Master_Vo > doctorMap = ListUtil . toMap ( doctorDefectNum , Archive_Master_Vo : : getArchiveDetailId ) ;
Setters . < Archive_Master_Vo > instance ( ) . list ( list ) . cycleSetProperties ( p - > {
String doctorId = p . getId ( ) ;
if ( doctorMap . containsKey ( doctorId ) ) {
@ -311,7 +311,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
//获取护士缺陷数量
List < Archive_Master_Vo > nurseDefectNum = archiveMasterMapper . getNurseDefectNum ( ids ) ;
//护士是否有缺陷
Map < String , Archive_Master_Vo > nurseMap = ListUtil s . toMap ( nurseDefectNum , Archive_Master_Vo : : getArchiveDetailId ) ;
Map < String , Archive_Master_Vo > nurseMap = ListUtil . toMap ( nurseDefectNum , Archive_Master_Vo : : getArchiveDetailId ) ;
//判断是否有缺陷就填入
Setters . < Archive_Master_Vo > instance ( ) . list ( list ) . cycleSetProperties ( p - > {
String nurseId = p . getId ( ) ;
@ -627,7 +627,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
dic . setTypecode ( "dept_code" ) ;
List < Emr_Dictionary > dicList = emrDictionaryService . dicByTypeCode ( dic ) ;
//转换科室
Map < String , Emr_Dictionary > codeMap = ListUtil s . toMap ( dicList , Emr_Dictionary : : getCode ) ;
Map < String , Emr_Dictionary > codeMap = ListUtil . toMap ( dicList , Emr_Dictionary : : getCode ) ;
Setters . < Archive_Master_Vo > instance ( ) . list ( list ) . cycleSetProperties ( p - > {
String deptCode = p . getDeptName ( ) ;
String deptAdmissionCode = p . getDeptAdmissionTo ( ) ;
@ -641,13 +641,13 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
}
} ) ;
//masterIds集合
List < String > masterIds = ListUtil s . distinctSelect ( list , Archive_Master_Vo : : getId ) ;
List < String > masterIds = ListUtil . distinctSelect ( list , Archive_Master_Vo : : getId ) ;
//转成逗号拼接
String ids = String . join ( "," , masterIds ) ;
//获取医生缺陷数量
List < Archive_Master_Vo > doctorDefectNum = archiveMasterMapper . getDoctorDefectNum ( ids ) ;
//医生是否有缺陷
Map < String , Archive_Master_Vo > doctorMap = ListUtil s . toMap ( doctorDefectNum , Archive_Master_Vo : : getArchiveDetailId ) ;
Map < String , Archive_Master_Vo > doctorMap = ListUtil . toMap ( doctorDefectNum , Archive_Master_Vo : : getArchiveDetailId ) ;
Setters . < Archive_Master_Vo > instance ( ) . list ( list ) . cycleSetProperties ( p - > {
String doctorId = p . getId ( ) ;
if ( doctorMap . containsKey ( doctorId ) ) {
@ -659,7 +659,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
//获取护士缺陷数量
List < Archive_Master_Vo > nurseDefectNum = archiveMasterMapper . getNurseDefectNum ( ids ) ;
//护士是否有缺陷
Map < String , Archive_Master_Vo > nurseMap = ListUtil s . toMap ( nurseDefectNum , Archive_Master_Vo : : getArchiveDetailId ) ;
Map < String , Archive_Master_Vo > nurseMap = ListUtil . toMap ( nurseDefectNum , Archive_Master_Vo : : getArchiveDetailId ) ;
//判断是否有缺陷就填入
Setters . < Archive_Master_Vo > instance ( ) . list ( list ) . cycleSetProperties ( p - > {
String nurseId = p . getId ( ) ;
@ -858,6 +858,41 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
List < Emr_Dictionary > dicList = emrDictionaryService . dicByTypeCode ( dic ) ;
List < Archive_Master_Vo > list = archiveMasterMapper . selectOverdue ( archiveMasterVo ) ;
if ( list ! = null & & list . size ( ) > 0 ) {
//转换科室
Map < String , Emr_Dictionary > codeMap = ListUtil . toMap ( dicList , Emr_Dictionary : : getCode ) ;
Setters . < Archive_Master_Vo > instance ( ) . list ( list ) . cycleSetProperties ( p - > {
String deptCode = p . getDeptName ( ) ;
String deptAdmissionCode = p . getDeptAdmissionTo ( ) ;
if ( StringUtils . isNotBlank ( deptCode ) & & codeMap . containsKey ( deptCode ) ) {
String deptName = codeMap . get ( deptCode ) . getName ( ) ;
p . setDeptName ( deptName ) ;
}
if ( StringUtils . isNotBlank ( deptAdmissionCode ) & & codeMap . containsKey ( deptAdmissionCode ) ) {
String deptAdmissionTo = codeMap . get ( deptAdmissionCode ) . getName ( ) ;
p . setDeptAdmissionTo ( deptAdmissionTo ) ;
}
} ) ;
//masterIds集合
List < String > masterIds = ListUtil . distinctSelect ( list , Archive_Master_Vo : : getMasterId ) ;
//分批次
List < List < String > > newList = ListUtils . partition ( masterIds , 1000 ) ;
for ( List < String > messageList : newList ) {
//转成逗号拼接
String ids = String . join ( "," , messageList ) ;
//根据分页的masterId获取签收信息
List < Archive_Master_Vo > followingInfo = archiveMasterMapper . getFollowingInfo ( ids ) ;
//医生是否有缺陷
Map < String , Archive_Master_Vo > followingMap = ListUtil . toMap ( followingInfo , Archive_Master_Vo : : getMasterId ) ;
Setters . < Archive_Master_Vo > instance ( ) . list ( list ) . cycleSetProperties ( p - > {
String masterId = p . getMasterId ( ) ;
if ( followingMap . containsKey ( masterId ) ) {
String handleTime = followingMap . get ( masterId ) . getHandleTime ( ) ;
String handleName = followingMap . get ( masterId ) . getHandleName ( ) ;
p . setHandleTime ( handleTime ) ;
p . setHandleName ( handleName ) ;
}
} ) ;
}
//查询用户集合
JSONArray powerUsers = powerUserService . getPowerUserList ( "1" ) ;
List < Power_User_Dto > powerUserList = null ;
@ -885,10 +920,16 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
}
Calendar ca1 = Calendar . getInstance ( ) ;
Calendar ca2 = Calendar . getInstance ( ) ;
Calendar ca3 = Calendar . getInstance ( ) ;
ca1 . setTime ( date1 ) ;
ca2 . setTime ( date2 ) ;
ca3 . setTime ( date3 ) ;
long distanceMin = ( ca2 . getTimeInMillis ( ) - ca1 . getTimeInMillis ( ) ) / ( 1000 * 60 * 60 * 24 ) ;
long distanceMin2 = ( ca2 . getTimeInMillis ( ) - ca3 . getTimeInMillis ( ) ) / ( 1000 * 60 * 60 * 24 ) ;
int i = ( int ) distanceMin ;
int i2 = ( int ) distanceMin2 ;
archiveMaster . setDiffDay ( String . valueOf ( i2 ) ) ;
archiveMasterVo . setDischargeDateTime1 ( date3 ) ;
if ( i > 0 ) {
archiveMaster . setOverTime ( i ) ;
} else {
@ -903,25 +944,92 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
archiveMaster . setFirstInstance ( name ) ;
}
}
//转换科室
for ( int k = 0 ; k < dicList . size ( ) ; k + + ) {
if ( StringUtils . isNotBlank ( archiveMaster . getDeptName ( ) ) ) {
String deptName = archiveMaster . getDeptName ( ) ;
if ( deptName . equals ( dicList . get ( k ) . getCode ( ) ) ) {
//出院科室
deptName = deptName . replace ( deptName , dicList . get ( k ) . getName ( ) ) ;
archiveMaster . setDeptName ( deptName ) ;
}
}
}
}
return list ;
}
@Override
public List < Archive_Master_Vo > selectOverdueE ( Archive_Master_Vo archiveMasterVo ) {
DateFormat format = new SimpleDateFormat ( "yyyy-MM-dd" ) ;
Date date1 = null ;
Date date2 = null ;
Date date3 = null ;
Emr_Dictionary dic = new Emr_Dictionary ( ) ;
dic . setEffective ( 1 ) ;
dic . setTypecode ( "dept_code" ) ;
//科室列表
List < Emr_Dictionary > dicList = emrDictionaryService . dicByTypeCode ( dic ) ;
List < Archive_Master_Vo > list = archiveMasterMapper . selectOverdueE ( archiveMasterVo ) ;
if ( list ! = null & & list . size ( ) > 0 ) {
//转换科室
Map < String , Emr_Dictionary > codeMap = ListUtil . toMap ( dicList , Emr_Dictionary : : getCode ) ;
Setters . < Archive_Master_Vo > instance ( ) . list ( list ) . cycleSetProperties ( p - > {
String deptCode = p . getDeptName ( ) ;
String deptAdmissionCode = p . getDeptAdmissionTo ( ) ;
if ( StringUtils . isNotBlank ( deptCode ) & & codeMap . containsKey ( deptCode ) ) {
String deptName = codeMap . get ( deptCode ) . getName ( ) ;
p . setDeptName ( deptName ) ;
}
if ( StringUtils . isNotBlank ( deptAdmissionCode ) & & codeMap . containsKey ( deptAdmissionCode ) ) {
String deptAdmissionTo = codeMap . get ( deptAdmissionCode ) . getName ( ) ;
p . setDeptAdmissionTo ( deptAdmissionTo ) ;
}
} ) ;
//查询用户集合
JSONArray powerUsers = powerUserService . getPowerUserList ( "1" ) ;
List < Power_User_Dto > powerUserList = null ;
if ( ! CollectionUtils . isEmpty ( powerUsers ) ) {
//转换对象
powerUserList = JSONArray . parseArray ( powerUsers . toJSONString ( ) , Power_User_Dto . class ) ;
}
//遍历赋值
for ( Archive_Master_Vo archiveMaster : list ) {
if ( null ! = powerUserList ) {
//获取主管医生
String doctorInCharge = archiveMaster . getDoctorInCharge ( ) ;
//获取 初审人
String firstInstance = archiveMaster . getFirstInstance ( ) ;
//遍历匹配工号赋值姓名
String overTime1 = archiveMaster . getOverTime1 ( ) ;
String handleTime = archiveMaster . getHandleTime ( ) ;
String dischargeDateTime = archiveMaster . getDischargeDateTime ( ) ;
try {
date1 = format . parse ( overTime1 ) ;
date2 = format . parse ( handleTime ) ;
date3 = format . parse ( dischargeDateTime ) ;
} catch ( ParseException e ) {
e . printStackTrace ( ) ;
}
Calendar ca1 = Calendar . getInstance ( ) ;
Calendar ca2 = Calendar . getInstance ( ) ;
Calendar ca3 = Calendar . getInstance ( ) ;
ca1 . setTime ( date1 ) ;
ca2 . setTime ( date2 ) ;
ca3 . setTime ( date3 ) ;
long distanceMin = ( ca2 . getTimeInMillis ( ) - ca1 . getTimeInMillis ( ) ) / ( 1000 * 60 * 60 * 24 ) ;
long distanceMin2 = ( ca2 . getTimeInMillis ( ) - ca3 . getTimeInMillis ( ) ) / ( 1000 * 60 * 60 * 24 ) ;
int i = ( int ) distanceMin ;
int i2 = ( int ) distanceMin2 ;
archiveMaster . setDiffDay ( String . valueOf ( i2 ) ) ;
archiveMasterVo . setDischargeDateTime1 ( date3 ) ;
if ( i > 0 ) {
archiveMaster . setOverTime ( i ) ;
} else {
archiveMaster . setOverTime ( 0 ) ;
}
for ( Power_User_Dto powerUserDto : powerUserList ) {
String name = powerUserDto . getName ( ) ;
if ( StringUtils . isNotBlank ( doctorInCharge ) & & powerUserDto . getUserName ( ) . equals ( doctorInCharge ) ) {
archiveMaster . setDoctorInCharge ( name ) ;
}
if ( StringUtils . isNotBlank ( archiveMaster . getDeptAdmissionTo ( ) ) ) {
String dept2 = archiveMaster . getDeptAdmissionTo ( ) ;
if ( dept2 ! = null & & dept2 . equals ( dicList . get ( k ) . getCode ( ) ) ) {
//入院科室dept_admission_to
dept2 = dept2 . replace ( dept2 , dicList . get ( k ) . getName ( ) ) ;
archiveMaster . setDeptAdmissionTo ( dept2 ) ;
}
if ( StringUtils . isNotBlank ( firstInstance ) & & powerUserDto . getUserName ( ) . equals ( firstInstance ) ) {
archiveMaster . setFirstInstance ( name ) ;
}
}
}
}
@ -949,13 +1057,13 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
if ( list ! = null & & list . size ( ) > 0 ) {
//赋值签收信息
//masterIds集合
List < String > masterIds = ListUtil s . distinctSelect ( list , Archive_Master_Vo : : getMasterId ) ;
List < String > masterIds = ListUtil . distinctSelect ( list , Archive_Master_Vo : : getMasterId ) ;
//转成逗号拼接
String ids = String . join ( "," , masterIds ) ;
//根据分页的masterId获取签收信息
List < Archive_Master_Vo > followingInfo = archiveMasterMapper . getFollowingInfo ( ids ) ;
//医生是否有缺陷
Map < String , Archive_Master_Vo > followingMap = ListUtil s . toMap ( followingInfo , Archive_Master_Vo : : getMasterId ) ;
Map < String , Archive_Master_Vo > followingMap = ListUtil . toMap ( followingInfo , Archive_Master_Vo : : getMasterId ) ;
Setters . < Archive_Master_Vo > instance ( ) . list ( list ) . cycleSetProperties ( p - > {
String masterId = p . getMasterId ( ) ;
if ( followingMap . containsKey ( masterId ) ) {
@ -965,6 +1073,11 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
p . setHandleName ( handleName ) ;
}
} ) ;
Emr_Dictionary dic = new Emr_Dictionary ( ) ;
dic . setEffective ( 1 ) ;
dic . setTypecode ( "dept_code" ) ;
//科室列表
List < Emr_Dictionary > dicList = emrDictionaryService . dicByTypeCode ( dic ) ;
//查询用户集合
JSONArray powerUsers = powerUserService . getPowerUserList ( "1" ) ;
List < Power_User_Dto > powerUserList = null ;
@ -1019,11 +1132,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
archiveMaster . setFirstInstance ( name ) ;
}
}
Emr_Dictionary dic = new Emr_Dictionary ( ) ;
dic . setEffective ( 1 ) ;
dic . setTypecode ( "dept_code" ) ;
//科室列表
List < Emr_Dictionary > dicList = emrDictionaryService . dicByTypeCode ( dic ) ;
//转换科室
for ( int k = 0 ; k < dicList . size ( ) ; k + + ) {
if ( StringUtils . isNotBlank ( archiveMaster . getDeptName ( ) ) ) {
@ -1053,6 +1162,11 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
@Override
public List < Archive_Master_Vo > selectOverdueXls2 ( Archive_Master_Vo archiveMasterVo ) {
Emr_Dictionary dic = new Emr_Dictionary ( ) ;
dic . setEffective ( 1 ) ;
dic . setTypecode ( "dept_code" ) ;
//科室列表
List < Emr_Dictionary > dicList = emrDictionaryService . dicByTypeCode ( dic ) ;
List < Archive_Master_Vo > list = archiveMasterMapper . selectOverdue2 ( archiveMasterVo ) ;
if ( list ! = null & & list . size ( ) > 0 ) {
//查询用户集合
@ -1079,6 +1193,27 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
archiveMaster . setFirstInstance ( name ) ;
}
}
//转换科室
for ( int k = 0 ; k < dicList . size ( ) ; k + + ) {
if ( StringUtils . isNotBlank ( archiveMaster . getDeptName ( ) ) ) {
String deptName = archiveMaster . getDeptName ( ) ;
if ( deptName . equals ( dicList . get ( k ) . getCode ( ) ) ) {
//出院科室
deptName = deptName . replace ( deptName , dicList . get ( k ) . getName ( ) ) ;
archiveMaster . setDeptName ( deptName ) ;
}
}
if ( StringUtils . isNotBlank ( archiveMaster . getDeptAdmissionTo ( ) ) ) {
String dept2 = archiveMaster . getDeptAdmissionTo ( ) ;
if ( dept2 ! = null & & dept2 . equals ( dicList . get ( k ) . getCode ( ) ) ) {
//入院科室dept_admission_to
dept2 = dept2 . replace ( dept2 , dicList . get ( k ) . getName ( ) ) ;
archiveMaster . setDeptAdmissionTo ( dept2 ) ;
}
}
}
}
}
}
@ -1180,6 +1315,32 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
}
//遍历赋值
for ( Archive_Master_Vo archiveMaster : list ) {
Emr_Dictionary dic = new Emr_Dictionary ( ) ;
dic . setEffective ( 1 ) ;
dic . setTypecode ( "dept_code" ) ;
//科室列表
List < Emr_Dictionary > dicList = emrDictionaryService . dicByTypeCode ( dic ) ;
//转换科室
for ( int k = 0 ; k < dicList . size ( ) ; k + + ) {
if ( StringUtils . isNotBlank ( archiveMaster . getDeptName ( ) ) ) {
String deptName = archiveMaster . getDeptName ( ) ;
if ( deptName . equals ( dicList . get ( k ) . getCode ( ) ) ) {
//出院科室
deptName = deptName . replace ( deptName , dicList . get ( k ) . getName ( ) ) ;
archiveMaster . setDeptName ( deptName ) ;
}
}
if ( StringUtils . isNotBlank ( archiveMaster . getDeptAdmissionTo ( ) ) ) {
String dept2 = archiveMaster . getDeptAdmissionTo ( ) ;
if ( dept2 ! = null & & dept2 . equals ( dicList . get ( k ) . getCode ( ) ) ) {
//入院科室dept_admission_to
dept2 = dept2 . replace ( dept2 , dicList . get ( k ) . getName ( ) ) ;
archiveMaster . setDeptAdmissionTo ( dept2 ) ;
}
}
}
String overTime1 = archiveMaster . getOverTime1 ( ) ;
String handleTime = archiveMaster . getAgainTime ( ) ;
try {
@ -1339,12 +1500,12 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
List < Emr_Dictionary > dicList = emrDictionaryService . dicByTypeCode ( dic ) ;
//添加封存类型
//masterIds集合
List < String > masterIds = ListUtil s . distinctSelect ( list , Archive_Master_Vo : : getMasterId ) ;
List < String > masterIds = ListUtil . distinctSelect ( list , Archive_Master_Vo : : getMasterId ) ;
//转成逗号拼接
String ids = String . join ( "," , masterIds ) ;
//查询封存记录
List < Archive_Master_Vo > archiveMasterVos = archiveMasterMapper . selectFollowing ( ids ) ;
Map < String , Archive_Master_Vo > masterIdMap = ListUtil s . toMap ( archiveMasterVos , Archive_Master_Vo : : getMasterId ) ;
Map < String , Archive_Master_Vo > masterIdMap = ListUtil . toMap ( archiveMasterVos , Archive_Master_Vo : : getMasterId ) ;
Setters . < Archive_Master_Vo > instance ( ) . list ( list ) . cycleSetProperties ( p - > {
String masterId = p . getMasterId ( ) ;
if ( masterIdMap . containsKey ( masterId ) ) {
@ -1352,7 +1513,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
}
} ) ;
//转换科室
Map < String , Emr_Dictionary > codeMap = ListUtil s . toMap ( dicList , Emr_Dictionary : : getCode ) ;
Map < String , Emr_Dictionary > codeMap = ListUtil . toMap ( dicList , Emr_Dictionary : : getCode ) ;
Setters . < Archive_Master_Vo > instance ( ) . list ( list ) . cycleSetProperties ( p - > {
String afekeepingCode = p . getSafekeepingName ( ) ;
if ( StringUtils . isNotBlank ( afekeepingCode ) & & codeMap . containsKey ( afekeepingCode ) ) {
@ -1423,13 +1584,13 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
//转换科室
List < Archive_Master_Vo > list = archiveMasterMapper . selectByCmtCol ( archiveMasterVo ) ;
//masterIds集合
List < String > masterIds = ListUtil s . distinctSelect ( list , Archive_Master_Vo : : getId ) ;
List < String > masterIds = ListUtil . distinctSelect ( list , Archive_Master_Vo : : getId ) ;
//转成逗号拼接
String ids = String . join ( "," , masterIds ) ;
//获取医生缺陷数量
List < Archive_Master_Vo > doctorDefectNum = archiveMasterMapper . getDoctorDefectNum ( ids ) ;
//医生是否有缺陷
Map < String , Archive_Master_Vo > doctorMap = ListUtil s . toMap ( doctorDefectNum , Archive_Master_Vo : : getArchiveDetailId ) ;
Map < String , Archive_Master_Vo > doctorMap = ListUtil . toMap ( doctorDefectNum , Archive_Master_Vo : : getArchiveDetailId ) ;
Setters . < Archive_Master_Vo > instance ( ) . list ( list ) . cycleSetProperties ( p - > {
String doctorId = p . getId ( ) ;
if ( doctorMap . containsKey ( doctorId ) ) {
@ -1441,7 +1602,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
//获取护士缺陷数量
List < Archive_Master_Vo > nurseDefectNum = archiveMasterMapper . getNurseDefectNum ( ids ) ;
//护士是否有缺陷
Map < String , Archive_Master_Vo > nurseMap = ListUtil s . toMap ( nurseDefectNum , Archive_Master_Vo : : getArchiveDetailId ) ;
Map < String , Archive_Master_Vo > nurseMap = ListUtil . toMap ( nurseDefectNum , Archive_Master_Vo : : getArchiveDetailId ) ;
//判断是否有缺陷就填入
Setters . < Archive_Master_Vo > instance ( ) . list ( list ) . cycleSetProperties ( p - > {
String nurseId = p . getId ( ) ;
@ -1457,7 +1618,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
dic . setTypecode ( "dept_code" ) ;
List < Emr_Dictionary > dicList = emrDictionaryService . dicByTypeCode ( dic ) ;
//转换科室
Map < String , Emr_Dictionary > codeMap = ListUtil s . toMap ( dicList , Emr_Dictionary : : getCode ) ;
Map < String , Emr_Dictionary > codeMap = ListUtil . toMap ( dicList , Emr_Dictionary : : getCode ) ;
Setters . < Archive_Master_Vo > instance ( ) . list ( list ) . cycleSetProperties ( p - > {
String deptCode = p . getDeptName ( ) ;
String deptAdmissionCode = p . getDeptAdmissionTo ( ) ;