|
|
|
@ -453,7 +453,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
|
|
|
|
|
PageHelper.offsetPage(offset, limit);
|
|
|
|
|
}
|
|
|
|
|
List<Archive_Master_Vo> list = archiveMasterMapper.selectByUnfileNew(archiveMasterVo);
|
|
|
|
|
//转换科室
|
|
|
|
|
Emr_Dictionary dic = new Emr_Dictionary();
|
|
|
|
|
dic.setEffective(1);
|
|
|
|
|
dic.setTypecode("dept_code");
|
|
|
|
@ -462,18 +461,24 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
|
|
|
|
|
for (Archive_Master_Vo archiveMaster:list)
|
|
|
|
|
//转换科室
|
|
|
|
|
for (int k = 0; k < dicList.size(); k++) {
|
|
|
|
|
String deptName = archiveMaster.getDeptName();
|
|
|
|
|
String dept2 = archiveMaster.getDeptAdmissionTo();
|
|
|
|
|
if (deptName.equals(dicList.get(k).getCode())) {
|
|
|
|
|
//出院科室
|
|
|
|
|
deptName = deptName.replace(deptName, dicList.get(k).getName());
|
|
|
|
|
archiveMaster.setDeptName(deptName);
|
|
|
|
|
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(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(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);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
//设置医生、护士名称和打印标识
|
|
|
|
|
setNameAndPrintFlag(archiveMasterVo, list);
|
|
|
|
@ -485,6 +490,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
|
|
|
|
|
public OffsetLimitPage selectStorageByCol(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
|
|
|
|
|
PageHelper.offsetPage(offset, limit);
|
|
|
|
|
List<Archive_Master_Vo> list = archiveMasterMapper.selectStorageByCol(archiveMasterVo);
|
|
|
|
|
//查询科室列表
|
|
|
|
|
Emr_Dictionary dic = new Emr_Dictionary();
|
|
|
|
|
dic.setEffective(1);
|
|
|
|
|
dic.setTypecode("dept_code");
|
|
|
|
@ -492,17 +498,21 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
|
|
|
|
|
//转换科室
|
|
|
|
|
for (Archive_Master_Vo archiveMaster:list){
|
|
|
|
|
for (int k = 0; k < dicList.size(); k++) {
|
|
|
|
|
String deptName = archiveMaster.getDeptName();
|
|
|
|
|
String dept2 = archiveMaster.getDeptAdmissionTo();
|
|
|
|
|
if (deptName.equals(dicList.get(k).getCode())) {
|
|
|
|
|
//出院科室
|
|
|
|
|
deptName = deptName.replace(deptName, dicList.get(k).getName());
|
|
|
|
|
archiveMaster.setDeptName(deptName);
|
|
|
|
|
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(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(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);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -511,7 +521,34 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public List<Archive_Master_Vo> selectStorageByCol(Archive_Master_Vo archiveMasterVo) {
|
|
|
|
|
return archiveMasterMapper.selectStorageByCol(archiveMasterVo);
|
|
|
|
|
List<Archive_Master_Vo> archiveMasterVos = archiveMasterMapper.selectStorageByCol(archiveMasterVo);
|
|
|
|
|
//查询科室列表
|
|
|
|
|
Emr_Dictionary dic = new Emr_Dictionary();
|
|
|
|
|
dic.setEffective(1);
|
|
|
|
|
dic.setTypecode("dept_code");
|
|
|
|
|
List<Emr_Dictionary> dicList = emrDictionaryService.dicByTypeCode(dic);
|
|
|
|
|
//转换科室
|
|
|
|
|
for (Archive_Master_Vo archiveMaster:archiveMasterVos){
|
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return archiveMasterVos;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@ -649,18 +686,23 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
|
|
|
|
|
}
|
|
|
|
|
//转换科室
|
|
|
|
|
for (int k = 0; k < dicList.size(); k++) {
|
|
|
|
|
String deptName = archiveMaster.getDeptName();
|
|
|
|
|
String dept2 = archiveMaster.getDeptAdmissionTo();
|
|
|
|
|
if (deptName.equals(dicList.get(k).getCode())) {
|
|
|
|
|
//出院科室
|
|
|
|
|
deptName = deptName.replace(deptName, dicList.get(k).getName());
|
|
|
|
|
archiveMaster.setDeptName(deptName);
|
|
|
|
|
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(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(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);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -740,18 +782,24 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
|
|
|
|
|
List<Emr_Dictionary> dicList = emrDictionaryService.dicByTypeCode(dic);
|
|
|
|
|
//转换科室
|
|
|
|
|
for (int k = 0; k < dicList.size(); k++) {
|
|
|
|
|
String deptName = archiveMaster.getDeptName();
|
|
|
|
|
String dept2 = archiveMaster.getDeptAdmissionTo();
|
|
|
|
|
if (deptName.equals(dicList.get(k).getCode())) {
|
|
|
|
|
//出院科室
|
|
|
|
|
deptName = deptName.replace(deptName, dicList.get(k).getName());
|
|
|
|
|
archiveMaster.setDeptName(deptName);
|
|
|
|
|
}
|
|
|
|
|
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(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);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|