|
|
|
@ -9,6 +9,7 @@ package com.emr.service.ipml;
|
|
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
|
import com.emr.dao.*;
|
|
|
|
|
import com.emr.service.Emr_DictionaryService;
|
|
|
|
|
import com.emr.util.HttpClientTool;
|
|
|
|
|
import com.emr.util.IDHelper;
|
|
|
|
|
import com.emr.vo.GetTime;
|
|
|
|
@ -69,6 +70,8 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private Archive_Master_FollowingMapper archiveMasterFollowingMapper;
|
|
|
|
|
@Autowired
|
|
|
|
|
private Emr_DictionaryService emrDictionaryService;
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public Archive_Master selectById(String id) {
|
|
|
|
@ -521,6 +524,11 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
|
|
|
|
|
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.selectOverdue(archiveMasterVo);
|
|
|
|
|
if(list!=null && list.size()>0) {
|
|
|
|
|
//查询用户集合
|
|
|
|
@ -554,23 +562,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
|
|
|
|
|
ca2.setTime(date2);
|
|
|
|
|
long distanceMin =( ca2.getTimeInMillis()- ca1.getTimeInMillis())/(1000*60*60*24);
|
|
|
|
|
int i= (int)distanceMin;
|
|
|
|
|
// archiveMasterVo.setDischargeDateTime1(date3);
|
|
|
|
|
// Integer integer = archiveMasterMapper.selectTime1(archiveMasterVo);
|
|
|
|
|
// System.out.println("integer:::::"+integer);
|
|
|
|
|
// if (integer==1){
|
|
|
|
|
// if (i>0){
|
|
|
|
|
// archiveMaster.setOverTime(i);
|
|
|
|
|
// }else {
|
|
|
|
|
// archiveMaster.setOverTime(0);
|
|
|
|
|
// }
|
|
|
|
|
// }else
|
|
|
|
|
// if (integer==2){
|
|
|
|
|
// if (i>0){
|
|
|
|
|
// archiveMaster.setOverTime(i);
|
|
|
|
|
// }else {
|
|
|
|
|
// archiveMaster.setOverTime(0);
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
if (i>0){
|
|
|
|
|
archiveMaster.setOverTime(i);
|
|
|
|
|
}else {
|
|
|
|
@ -585,6 +576,21 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
|
|
|
|
|
archiveMaster.setFirstInstance(name);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//转换科室
|
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -643,22 +649,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
|
|
|
|
|
|
|
|
|
|
int i= (int)distanceMin;
|
|
|
|
|
archiveMasterVo.setDischargeDateTime1(date3);
|
|
|
|
|
// Integer integer = archiveMasterMapper.selectTime1(archiveMasterVo);
|
|
|
|
|
// System.out.println("integer:::::"+integer);
|
|
|
|
|
// if (integer==1){
|
|
|
|
|
// if (i>0){
|
|
|
|
|
// archiveMaster.setOverTime(i);
|
|
|
|
|
// }else {
|
|
|
|
|
// archiveMaster.setOverTime(0);
|
|
|
|
|
// }
|
|
|
|
|
// }else
|
|
|
|
|
// if (integer==2){
|
|
|
|
|
// if (i>0){
|
|
|
|
|
// archiveMaster.setOverTime(i);
|
|
|
|
|
// }else {
|
|
|
|
|
// archiveMaster.setOverTime(0);
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
if (i>0){
|
|
|
|
|
archiveMaster.setOverTime(i);
|
|
|
|
|
}else {
|
|
|
|
@ -673,6 +663,26 @@ 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++) {
|
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|