|
|
@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
import com.yihu.jw.doctor.dao.BaseDoctorDao;
|
|
|
import com.yihu.jw.door.dao.*;
|
|
|
import com.yihu.jw.door.util.MessageUtil;
|
|
|
import com.yihu.jw.door.util.StreamUtil;
|
|
|
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
|
|
|
import com.yihu.jw.entity.base.im.ConsultDo;
|
|
|
import com.yihu.jw.entity.base.im.ConsultTeamDo;
|
|
|
@ -1650,9 +1651,10 @@ public class DoorOrderService {
|
|
|
fileName = java.net.URLEncoder.encode(fileName,"UTF-8");
|
|
|
fileName = java.net.URLDecoder.decode(fileName,"UTF-8");
|
|
|
response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
|
|
|
String pathName = this.getClass().getResource("/").getPath() + "conclusion.mht";
|
|
|
System.out.println("路径pathName：" + pathName);
|
|
|
Document doc = Jsoup.parse(new File(pathName), "UTF-8");
|
|
|
// String pathName = this.getClass().getResource("/").getPath() + "conclusion.mht";
|
|
|
// System.out.println("路径pathName：" + pathName);
|
|
|
// Document doc = Jsoup.parse(new File(pathName), "UTF-8");
|
|
|
Document doc = Jsoup.parse(StreamUtil.readResources());
|
|
|
String html = this.handleData(doc, orderId.get(i));//16
|
|
|
BufferedWriter bw = new BufferedWriter(new FileWriter(path+"/"+fileName));//创建的文件
|
|
|
bw.write(html);
|
|
|
@ -1770,7 +1772,7 @@ public class DoorOrderService {
|
|
|
+" LEFT JOIN wlyy_door_doctor d on d.order_id = o.id ";
|
|
|
sql+= " where 1=1 ";
|
|
|
if(status == 6){//已完成状态
|
|
|
sql+=" and o.status ='"+status+"'";
|
|
|
sql+=" and o.status in (5,6) ";
|
|
|
}else {//5是待补录状态
|
|
|
sql+=" and o.conclusion_status =1 ";
|
|
|
}
|
