|
@ -7,6 +7,7 @@ import com.yihu.jw.restmodel.hospital.consult.WlyyHospitalSysDictVO;
|
|
import com.yihu.jw.restmodel.hospital.doctor.WlyyDoctorWorkTimeVO;
|
|
import com.yihu.jw.restmodel.hospital.doctor.WlyyDoctorWorkTimeVO;
|
|
import com.yihu.jw.restmodel.hospital.prescription.WlyyOutpatientVO;
|
|
import com.yihu.jw.restmodel.hospital.prescription.WlyyOutpatientVO;
|
|
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionVO;
|
|
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionVO;
|
|
|
|
import com.yihu.jw.restmodel.web.Envelop;
|
|
import com.yihu.jw.restmodel.web.ListEnvelop;
|
|
import com.yihu.jw.restmodel.web.ListEnvelop;
|
|
import com.yihu.jw.restmodel.web.MixEnvelop;
|
|
import com.yihu.jw.restmodel.web.MixEnvelop;
|
|
import com.yihu.jw.restmodel.web.ObjEnvelop;
|
|
import com.yihu.jw.restmodel.web.ObjEnvelop;
|
|
@ -192,9 +193,9 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
|
|
@GetMapping(value = BaseHospitalRequestMapping.Prescription.findDoctorByHospitalAndDept)
|
|
@GetMapping(value = BaseHospitalRequestMapping.Prescription.findDoctorByHospitalAndDept)
|
|
@ApiOperation(value = "查询部门下医生", notes = "查询部门下医生")
|
|
@ApiOperation(value = "查询部门下医生", notes = "查询部门下医生")
|
|
public ListEnvelop findDoctorByHospitalAndDept(@ApiParam(name = "orgCode", value = "机构code")
|
|
public ListEnvelop findDoctorByHospitalAndDept(@ApiParam(name = "orgCode", value = "机构code")
|
|
@RequestParam(value = "orgCode", required = true)String orgCode,
|
|
|
|
|
|
@RequestParam(value = "orgCode", required = false)String orgCode,
|
|
@ApiParam(name = "dept", value = "部门code")
|
|
@ApiParam(name = "dept", value = "部门code")
|
|
@RequestParam(value = "dept", required = true)String dept,
|
|
|
|
|
|
@RequestParam(value = "dept", required = false)String dept,
|
|
@ApiParam(name = "chargeType", value = "号别")
|
|
@ApiParam(name = "chargeType", value = "号别")
|
|
@RequestParam(value = "chargeType", required = false)String chargeType,
|
|
@RequestParam(value = "chargeType", required = false)String chargeType,
|
|
@ApiParam(name = "doctorCode", value = "需要置顶医生")
|
|
@ApiParam(name = "doctorCode", value = "需要置顶医生")
|
|
@ -204,8 +205,10 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
|
|
@ApiParam(name = "startDate", value = "开始时间,yyyy-MM-dd HH:mm:ss")
|
|
@ApiParam(name = "startDate", value = "开始时间,yyyy-MM-dd HH:mm:ss")
|
|
@RequestParam(value = "startDate", required = false)String startDate,
|
|
@RequestParam(value = "startDate", required = false)String startDate,
|
|
@ApiParam(name = "endDate", value = "结束时间,yyyy-MM-dd HH:mm:ss")
|
|
@ApiParam(name = "endDate", value = "结束时间,yyyy-MM-dd HH:mm:ss")
|
|
@RequestParam(value = "endDate", required = false)String endDate) {
|
|
|
|
return success(prescriptionService.findDoctorByHospitalAndDept(orgCode,dept,chargeType,doctorCode,outpatientType,startDate,endDate));
|
|
|
|
|
|
@RequestParam(value = "endDate", required = false)String endDate,
|
|
|
|
@ApiParam(name = "key", value = "关键字搜索,医生名字/科室名称/专长")
|
|
|
|
@RequestParam(value = "key", required = false)String key) {
|
|
|
|
return success(prescriptionService.findDoctorByHospitalAndDept(orgCode,dept,chargeType,doctorCode,outpatientType,startDate,endDate,key));
|
|
}
|
|
}
|
|
|
|
|
|
@PostMapping(value = BaseHospitalRequestMapping.Prescription.appointmentRevisit)
|
|
@PostMapping(value = BaseHospitalRequestMapping.Prescription.appointmentRevisit)
|
|
@ -334,9 +337,9 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
|
|
@GetMapping(value = BaseHospitalRequestMapping.Prescription.findDoctorWithWork)
|
|
@GetMapping(value = BaseHospitalRequestMapping.Prescription.findDoctorWithWork)
|
|
@ApiOperation(value = "查询医生带排班", notes = "查询医生带排班")
|
|
@ApiOperation(value = "查询医生带排班", notes = "查询医生带排班")
|
|
public ObjEnvelop findDoctorWithWork(@ApiParam(name = "orgCode", value = "机构code")
|
|
public ObjEnvelop findDoctorWithWork(@ApiParam(name = "orgCode", value = "机构code")
|
|
@RequestParam(value = "orgCode", required = true)String orgCode,
|
|
|
|
|
|
@RequestParam(value = "orgCode", required = false)String orgCode,
|
|
@ApiParam(name = "dept", value = "部门code")
|
|
@ApiParam(name = "dept", value = "部门code")
|
|
@RequestParam(value = "dept", required = true)String dept,
|
|
|
|
|
|
@RequestParam(value = "dept", required = false)String dept,
|
|
@ApiParam(name = "doctorCode", value = "需要置顶医生code")
|
|
@ApiParam(name = "doctorCode", value = "需要置顶医生code")
|
|
@RequestParam(value = "doctorCode", required = false)String doctorCode,
|
|
@RequestParam(value = "doctorCode", required = false)String doctorCode,
|
|
@ApiParam(name = "chargeType", value = "号别")
|
|
@ApiParam(name = "chargeType", value = "号别")
|
|
@ -347,12 +350,14 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
|
|
@RequestParam(value = "startDate", required = false)String startDate,
|
|
@RequestParam(value = "startDate", required = false)String startDate,
|
|
@ApiParam(name = "endDate", value = "结束时间,yyyy-MM-dd HH:mm:ss")
|
|
@ApiParam(name = "endDate", value = "结束时间,yyyy-MM-dd HH:mm:ss")
|
|
@RequestParam(value = "endDate", required = false)String endDate,
|
|
@RequestParam(value = "endDate", required = false)String endDate,
|
|
|
|
@ApiParam(name = "key", value = "关键字搜索,医生名字/科室名称/专长")
|
|
|
|
@RequestParam(value = "key", required = false)String key,
|
|
@ApiParam(name = "page", value = "第几页")
|
|
@ApiParam(name = "page", value = "第几页")
|
|
@RequestParam(value = "page", required = true)Integer page,
|
|
@RequestParam(value = "page", required = true)Integer page,
|
|
@ApiParam(name = "size", value = "每页大小")
|
|
@ApiParam(name = "size", value = "每页大小")
|
|
@RequestParam(value = "size", required = true)Integer size) {
|
|
@RequestParam(value = "size", required = true)Integer size) {
|
|
|
|
|
|
return success(prescriptionService.findDoctorWithWork(orgCode,dept,chargeType,doctorCode,outpatientType,startDate,endDate,page,size));
|
|
|
|
|
|
return success(prescriptionService.findDoctorWithWork(orgCode,dept,chargeType,doctorCode,outpatientType,startDate,endDate,key,page,size));
|
|
}
|
|
}
|
|
|
|
|
|
@GetMapping(value = BaseHospitalRequestMapping.Prescription.findDoctorWithMouthWork)
|
|
@GetMapping(value = BaseHospitalRequestMapping.Prescription.findDoctorWithMouthWork)
|
|
@ -383,8 +388,10 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
|
|
@GetMapping(value = BaseHospitalRequestMapping.Prescription.findDoctorInfo)
|
|
@GetMapping(value = BaseHospitalRequestMapping.Prescription.findDoctorInfo)
|
|
@ApiOperation(value = "获取医生信息", notes = "获取医生信息")
|
|
@ApiOperation(value = "获取医生信息", notes = "获取医生信息")
|
|
public ObjEnvelop findDoctorInfo(@ApiParam(name = "doctor", value = "医生code")
|
|
public ObjEnvelop findDoctorInfo(@ApiParam(name = "doctor", value = "医生code")
|
|
@RequestParam(value = "doctor", required = false)String doctor){
|
|
|
|
return success(prescriptionService.findDoctorInfo(doctor));
|
|
|
|
|
|
@RequestParam(value = "doctor", required = false)String doctor,
|
|
|
|
@ApiParam(name = "withWork", value = "传1带排班,其他不带")
|
|
|
|
@RequestParam(value = "withWork", required = false)String withWork){
|
|
|
|
return success(prescriptionService.findDoctorInfo(doctor,withWork));
|
|
}
|
|
}
|
|
|
|
|
|
@PostMapping(value = BaseHospitalRequestMapping.Prescription.cancelOutPatient)
|
|
@PostMapping(value = BaseHospitalRequestMapping.Prescription.cancelOutPatient)
|
|
@ -458,6 +465,13 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
|
|
return success(prescriptionService.saveDoctorWorkTimeJson(type,codes,workTimeJson));
|
|
return success(prescriptionService.saveDoctorWorkTimeJson(type,codes,workTimeJson));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping(value = "test")
|
|
|
|
@ApiOperation(value = "test", notes = "test")
|
|
|
|
public Envelop test()throws Exception {
|
|
|
|
return success(prescriptionService.test());
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// @PostMapping(value = BaseHospitalRequestMapping.Prescription.findPatientInfo)
|
|
// @PostMapping(value = BaseHospitalRequestMapping.Prescription.findPatientInfo)
|
|
// @ApiOperation(value = "排班批量保存接口", notes = "排班批量保存接口")
|
|
// @ApiOperation(value = "排班批量保存接口", notes = "排班批量保存接口")
|
|
// public ObjEnvelop findPatientInfo(@ApiParam(name = "type", value = "1.全医院,2.科室,3.医生")
|
|
// public ObjEnvelop findPatientInfo(@ApiParam(name = "type", value = "1.全医院,2.科室,3.医生")
|