bug修改

svr/svr-rehabilitation/src/main/java/com/yihu/rehabilitation/controller/doctor/DoctorRehabilitationManageController.java

@@ -106,20 +106,14 @@ public class DoctorRehabilitationManageController extends EnvelopRestEndpoint {
    @RequestMapping(value = RehabilitationRequestMapping.DoctorRehabilitationManage.calendarPlanDetail, method = RequestMethod.GET)
    @ApiOperation("康复管理-康复计划按日历展示")
    public ObjEnvelop calendarPlanDetail(@ApiParam(name = "executeStartTime", value = "日历开始时间（格式：yyyy-MM-dd HH:mm:ss）")
                                     @RequestParam(value = "executeStartTime", required = false)String executeStartTime,
                                     @ApiParam(name = "executeEndTime", value = "日历结束时间（格式：yyyy-MM-dd HH:mm:ss）")
                                     @RequestParam(value = "executeEndTime", required = false)String executeEndTime,
                                     @ApiParam(name = "planId", value = "计划id", required = true)
                                     @RequestParam(value = "planId")String planId,
                                     @ApiParam(name = "searchTask", value = "快速查找任务：（1、我的任务，2、健康教育，3、健康指导，4、随访，5、复诊）", required = false)
                                     @RequestParam(value = "searchTask", required = false)Integer searchTask,
                                     @ApiParam(name = "doctorCode", value = "医生code（专科医生、家庭医生）", required = false)
                                     @RequestParam(value = "doctorCode", required = false)String doctorCode,
                                         @ApiParam(name = "taskExecutor", value = "1是本人任务", required = false)
                                             @RequestParam(value = "taskExecutor", required = false)String taskExecutor,
                                     @ApiParam(name = "status", value = "任务状态（0未完成，1已完成，2已预约）", required = false)
                                     @RequestParam(value = "status", required = false)Integer status){
    public ObjEnvelop calendarPlanDetail(
            @ApiParam(name = "executeStartTime", value = "日历开始时间（格式：yyyy-MM-dd HH:mm:ss）") @RequestParam(value = "executeStartTime", required = false)String executeStartTime,
            @ApiParam(name = "executeEndTime", value = "日历结束时间（格式：yyyy-MM-dd HH:mm:ss）") @RequestParam(value = "executeEndTime", required = false)String executeEndTime,
            @ApiParam(name = "planId", value = "计划id", required = true) @RequestParam(value = "planId")String planId,
            @ApiParam(name = "searchTask", value = "快速查找任务：（1、我的任务，2、健康教育，3、健康指导，4、随访，5、复诊）", required = false) @RequestParam(value = "searchTask", required = false)Integer searchTask,
            @ApiParam(name = "doctorCode", value = "医生code（专科医生、家庭医生）", required = false) @RequestParam(value = "doctorCode", required = false)String doctorCode,
            @ApiParam(name = "taskExecutor", value = "1是本人任务", required = false) @RequestParam(value = "taskExecutor", required = false)String taskExecutor,
            @ApiParam(name = "status", value = "任务状态（0未完成，1已完成，2已预约）", required = false) @RequestParam(value = "status", required = false)Integer status){
        try {
            if(!StringUtils.isNotEmpty(doctorCode)){
                doctorCode = getUID();

svr/svr-rehabilitation/src/main/java/com/yihu/rehabilitation/controller/patient/PatientRehabilitationManageController.java

@@ -155,11 +155,11 @@ public class PatientRehabilitationManageController extends EnvelopRestEndpoint {
        try {
            JSONObject json = new JSONObject(dataJson);
            if(json.has("patientCode")){
                BasePatientDO patient = basePatientDao.findById(json.get("patientCode")+"");
                BasePatientDO patient = basePatientDao.findById(json.get("patientCode")+"").orElse(null);
                json.put("patientName",patient!=null?patient.getName():"");
            }
            if(json.has("doctorCode")){
                BaseDoctorDO doctor = baseDoctorDao.findById(json.get("doctorCode")+"");
                BaseDoctorDO doctor = baseDoctorDao.findById(json.get("doctorCode")+"").orElse(null);
                json.put("doctorName",doctor!=null?doctor.getName():"");
            }
            RehabilitationOperateRecordsDO rehabilitationOperateRecordsDO= toEntity(json.toString(), RehabilitationOperateRecordsDO.class);

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/followup/controller/DoctorFollowUpController.java

@@ -447,24 +447,17 @@ public class DoctorFollowUpController extends BaseController {
    @RequestMapping(value = "/findFollowupByMonth",produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
    @ApiOperation("获取访视计划按月日历形式")
    public String findFollowupByMonth(@ApiParam(name = "doctor", value = "医生", defaultValue = "zjm20190214")
                                          @RequestParam(value = "doctor", required = true) String doctor,
                                      @ApiParam(name = "patient", value = "居民")
                                          @RequestParam(value = "patient", required = false) String patient,
                                      @ApiParam(name = "followupClass", value = "随访类别，多类别“,”分割")
                                          @RequestParam(value = "followupClass", required = false) String followupClass,
                                      @ApiParam(name = "patientName", value = "居民姓名")
                                          @RequestParam(value = "patientName", required = false) String patientName,
                                      @ApiParam(value = "开始时间，格式（yyyy-MM-dd）", name = "startDate",required = false)
                                          @RequestParam(value = "startDate", required = false) String startDate,
                                      @ApiParam(value = "结束时间，格式（yyyy-MM-dd）", name = "endDate",required = false)
                                          @RequestParam(value = "endDate", required = false) String endDate,
                                      @ApiParam(name = "flag", value = "区分上门访视(1-是)")
                                          @RequestParam(value = "flag", required = false) String flag,
                                      @ApiParam(name = "type", value = "区分随访计划1、新增随访2、临时随访3、入户随访")
                                          @RequestParam(value = "type", required = false) Integer type,
                                      @ApiParam(name = "status", value = "随访状态")
                                          @RequestParam(value = "status", required = false) String status){
    public String findFollowupByMonth(
            @ApiParam(name = "doctor", value = "医生", defaultValue = "zjm20190214") @RequestParam(value = "doctor", required = true) String doctor,
            @ApiParam(name = "patient", value = "居民") @RequestParam(value = "patient", required = false) String patient,
            @ApiParam(name = "followupClass", value = "随访类别，多类别“,”分割") @RequestParam(value = "followupClass", required = false) String followupClass,
            @ApiParam(name = "patientName", value = "居民姓名") @RequestParam(value = "patientName", required = false) String patientName,
            @ApiParam(value = "开始时间，格式（yyyy-MM-dd）", name = "startDate",required = false) @RequestParam(value = "startDate", required = false) String startDate,
            @ApiParam(value = "结束时间，格式（yyyy-MM-dd）", name = "endDate",required = false) @RequestParam(value = "endDate", required = false) String endDate,
            @ApiParam(name = "flag", value = "区分上门访视(1-是)") @RequestParam(value = "flag", required = false) String flag,
            @ApiParam(name = "type", value = "区分随访计划1、新增随访2、临时随访3、入户随访") @RequestParam(value = "type", required = false) Integer type,
            @ApiParam(name = "status", value = "随访状态") @RequestParam(value = "status", required = false) String status
    ){
        try {
            return write(200, "操作成功！","data",followUpService.findFollowupByMonth(doctor,patient,followupClass,patientName,startDate,endDate,flag,type,status));
        }catch (Exception e){
@@ -476,24 +469,16 @@ public class DoctorFollowUpController extends BaseController {
    @RequestMapping(value = "/findFollowupList",produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
    @ApiOperation("获取访视列表形式")
    public String findFollowupList(@ApiParam(name = "doctor", value = "医生", defaultValue = "zjm20190214")
                                       @RequestParam(value = "doctor", required = true) String doctor,
                                   @ApiParam(name = "patient", value = "居民")
                                       @RequestParam(value = "patient", required = false) String patient,
                                   @ApiParam(name = "followupClass", value = "随访类别，多类别“,”分割")
                                       @RequestParam(value = "followupClass", required = false) String followupClass,
                                   @ApiParam(name = "patientName", value = "居民姓名")
                                       @RequestParam(value = "patientName", required = false) String patientName,
                                   @ApiParam(value = "开始时间，格式（yyyy-MM-dd）", name = "startDate",required = false)
                                       @RequestParam(value = "startDate", required = false) String startDate,
                                   @ApiParam(value = "结束时间，格式（yyyy-MM-dd）", name = "endDate",required = false)
                                       @RequestParam(value = "endDate", required = false) String endDate,
                                   @ApiParam(name = "flag", value = "区分上门访视(1-是)")
                                       @RequestParam(value = "flag", required = false) String flag,
                                   @ApiParam(name = "type", value = "")
                                       @RequestParam(value = "type", required = false) Integer type,
                                   @ApiParam(name = "status", value = "随访状态")
                                       @RequestParam(value = "status", required = false) String status){
    public String findFollowupList(
            @ApiParam(name = "doctor", value = "医生", defaultValue = "zjm20190214") @RequestParam(value = "doctor", required = true) String doctor,
            @ApiParam(name = "patient", value = "居民") @RequestParam(value = "patient", required = false) String patient,
            @ApiParam(name = "followupClass", value = "随访类别，多类别“,”分割") @RequestParam(value = "followupClass", required = false) String followupClass,
            @ApiParam(name = "patientName", value = "居民姓名") @RequestParam(value = "patientName", required = false) String patientName,
            @ApiParam(value = "开始时间，格式（yyyy-MM-dd）", name = "startDate",required = false) @RequestParam(value = "startDate", required = false) String startDate,
            @ApiParam(value = "结束时间，格式（yyyy-MM-dd）", name = "endDate",required = false) @RequestParam(value = "endDate", required = false) String endDate,
            @ApiParam(name = "flag", value = "区分上门访视(1-是)") @RequestParam(value = "flag", required = false) String flag,
            @ApiParam(name = "type", value = "") @RequestParam(value = "type", required = false) Integer type,
            @ApiParam(name = "status", value = "随访状态") @RequestParam(value = "status", required = false) String status){
        try {
            return write(200, "操作成功！","data",followUpService.findFollowupList(null,doctor,patient,followupClass,patientName,startDate,endDate,flag,type,status));
        }catch (Exception e){