|
@ -29,7 +29,6 @@ import com.yihu.jw.util.excel.ExportUtl;
|
|
|
import com.yihu.jw.util.idcard.IdCardUtil;
|
|
|
import jxl.write.WritableSheet;
|
|
|
import jxl.write.WritableWorkbook;
|
|
|
import jxl.write.WriteException;
|
|
|
import org.apache.commons.collections.map.HashedMap;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.json.JSONArray;
|
|
@ -48,7 +47,6 @@ import org.springframework.jdbc.core.JdbcTemplate;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import javax.transaction.Transactional;
|
|
|
import java.io.IOException;
|
|
|
import java.io.OutputStream;
|
|
|
import java.text.DateFormat;
|
|
|
import java.text.SimpleDateFormat;
|
|
@ -1505,7 +1503,9 @@ public class FollowUpService {
|
|
|
old.setMobile(patientDO.getMobile());
|
|
|
//查找对应的下转记录
|
|
|
RehabilitationPatientInfoDO infoDO = findRehabilitationPatientInfo(followupId,followup.getPatientCode());
|
|
|
old.setVisitNo(infoDO.getVisitNo());
|
|
|
if(infoDO!=null){
|
|
|
old.setVisitNo(infoDO.getVisitNo());
|
|
|
}
|
|
|
}
|
|
|
old.setNextFollowupTime(DateUtil.dateToStrLong(followup.getFollowupNextDate()));
|
|
|
return old;
|
|
@ -1539,7 +1539,9 @@ public class FollowUpService {
|
|
|
old.setMobile(patientDO.getMobile());
|
|
|
//查找对应的下转记录
|
|
|
RehabilitationPatientInfoDO infoDO = findRehabilitationPatientInfo(followupId,followup.getPatientCode());
|
|
|
old.setVisitNo(infoDO.getVisitNo());
|
|
|
if(infoDO!=null){
|
|
|
old.setVisitNo(infoDO.getVisitNo());
|
|
|
}
|
|
|
}
|
|
|
old.setNextFollowupTime(DateUtil.dateToStrLong(followup.getFollowupNextDate()));
|
|
|
return old;
|
|
@ -1573,7 +1575,9 @@ public class FollowUpService {
|
|
|
old.setMobile(patientDO.getMobile());
|
|
|
//查找对应的下转记录
|
|
|
RehabilitationPatientInfoDO infoDO = findRehabilitationPatientInfo(followupId,followup.getPatientCode());
|
|
|
old.setVisitNo(infoDO.getVisitNo());
|
|
|
if(infoDO!=null){
|
|
|
old.setVisitNo(infoDO.getVisitNo());
|
|
|
}
|
|
|
}
|
|
|
old.setNextFollowupTime(DateUtil.dateToStrLong(followup.getFollowupNextDate()));
|
|
|
return old;
|