|
|
@ -1,39 +1,22 @@
|
|
|
package com.yihu.jw.hospital.endpoint.prescription;
|
|
|
|
|
|
import com.yihu.jw.doctor.service.excel.DoctorWorkTimeExcelReader;
|
|
|
import com.yihu.jw.doctor.service.excel.DoctorWorkTimeMainExcelDO;
|
|
|
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
|
|
|
import com.yihu.jw.entity.hospital.prescription.WlyyOutpatientDO;
|
|
|
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDiagnosisDO;
|
|
|
import com.yihu.jw.hospital.prescription.dao.OutpatientDao;
|
|
|
import com.yihu.jw.hospital.prescription.service.*;
|
|
|
import com.yihu.jw.hospital.prescription.service.entrance.DoctorPreSignService;
|
|
|
import com.yihu.jw.hospital.prescription.service.entrance.XzzxEntranceService;
|
|
|
import com.yihu.jw.hospital.prescription.service.YkyyPrescriptionService;
|
|
|
import com.yihu.jw.hospital.prescription.service.entrance.YkyyEntranceService;
|
|
|
import com.yihu.jw.hospital.service.SystemMessage.HospitalSystemMessageService;
|
|
|
import com.yihu.jw.im.service.ImService;
|
|
|
import com.yihu.jw.restmodel.hospital.prescription.WlyyOutpatientVO;
|
|
|
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionVO;
|
|
|
import com.yihu.jw.restmodel.im.ConsultVO;
|
|
|
import com.yihu.jw.restmodel.web.*;
|
|
|
import com.yihu.jw.restmodel.web.ListEnvelop;
|
|
|
import com.yihu.jw.restmodel.web.ObjEnvelop;
|
|
|
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
|
|
|
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
|
|
|
import com.yihu.jw.util.date.DateUtil;
|
|
|
import com.yihu.jw.wlyy.service.WlyyBusinessService;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import io.swagger.annotations.ApiParam;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.io.OutputStream;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
|
/**
|
|
|
* Created by Trick on 2019/5/16
|
|
|
@ -61,14 +44,18 @@ public class YkyyPrescriptionEndpoint extends EnvelopRestEndpoint {
|
|
|
@ApiParam(name = "page", value = "第几页")
|
|
|
@RequestParam(value = "page",required = false) Integer page,
|
|
|
@ApiParam(name = "size", value = "页面大小")
|
|
|
@RequestParam(value = "size",required = false) Integer size) throws Exception{
|
|
|
@RequestParam(value = "size",required = false) Integer size,
|
|
|
@ApiParam(name = "startTime", value = "开始时间")
|
|
|
@RequestParam(value = "startTime",required = false) String startTime,
|
|
|
@ApiParam(name = "endTime", value = "结束时间")
|
|
|
@RequestParam(value = "endTime",required = false) String endTime) throws Exception{
|
|
|
if(page==null){
|
|
|
page = 1;
|
|
|
}
|
|
|
if(size==null){
|
|
|
size = 10;
|
|
|
}
|
|
|
return success(ykyyEntranceService.vlisReportMasterlist(patient, page, size));
|
|
|
return success(ykyyEntranceService.vlisReportMasterlist(patient, page, size,startTime,endTime));
|
|
|
}
|
|
|
|
|
|
@GetMapping(value = "vlisReportMasterDetail")
|
