Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/sql记录

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/course/NurseryLogEndpoint.java

@@ -27,7 +27,7 @@ public class NurseryLogEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = "findNurseryLogByMonth")
    @ApiOperation("获取托育日志按月日历形式")
    public ObjEnvelop findNurseryLogByMonth(@ApiParam(name = "orgCode", value = "机构id")
    public Envelop findNurseryLogByMonth(@ApiParam(name = "orgCode", value = "机构id")
                                      @RequestParam(value = "orgCode", required = true) String orgCode,
                                          @ApiParam(name = "patient", value = "居民")
                                      @RequestParam(value = "patient", required = false) String patient,
@@ -40,36 +40,33 @@ public class NurseryLogEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("操作成功！",nurseryLogService.findNurseryLogByMonth(orgCode,patient,patientName,startDate,endDate));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError( "操作失败！");
            return  failedException(e);
        }
    }
    @GetMapping(value = "findNurseryLogList")
    @ApiOperation("获取托育日志列表-已填写")
    public ObjEnvelop findNurseryLogList(@ApiParam(name = "orgCode", value = "机构id")
    public Envelop findNurseryLogList(@ApiParam(name = "orgCode", value = "机构id")
                                            @RequestParam(value = "orgCode", required = true) String orgCode,
                                            @ApiParam(name = "recordDate", value = "时间")
                                            @RequestParam(value = "recordDate", required = false) String recordDate){
        try {
            return ObjEnvelop.getSuccess("操作成功！",nurseryLogService.findNurseryLogList(orgCode,recordDate));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError( "操作失败！");
            return  failedException(e);
        }
    }
    @GetMapping(value = "nuseryLogUnFilledIn")
    @ApiOperation("获取未填写日志列表")
    public ObjEnvelop nuseryLogUnFilledIn(@ApiParam(name = "orgCode", value = "机构id")
    public Envelop nuseryLogUnFilledIn(@ApiParam(name = "orgCode", value = "机构id")
                                         @RequestParam(value = "orgCode", required = true) String orgCode,
                                         @ApiParam(name = "recordDate", value = "时间")
                                         @RequestParam(value = "recordDate", required = false) String recordDate){
        try {
            return ObjEnvelop.getSuccess("操作成功！",nurseryLogService.nuseryLogUnFilledIn(orgCode,recordDate));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError( "操作失败！");
            return  failedException(e);
        }
    }
@@ -86,8 +83,7 @@ public class NurseryLogEndpoint extends EnvelopRestEndpoint {
        try {
            return success("新增成功",nurseryLogService.addNurseryLog(patient, patientName, doctor, doctorName, orgCode, orgName, recordDate));
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError( "新增失败!" ,-1);
            return  failedException(e);
        }
    }
@@ -98,11 +94,9 @@ public class NurseryLogEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "content", value = "课程记录内容") @RequestParam(value = "content", required = true) String content,
            @ApiParam(name = "enclosure", value = "附件") @RequestParam(value = "enclosure", required = false) String enclosure) {
        try {
            return success("新增成功",nurseryLogService.addCourseRecord(id, content, enclosure));
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError( "新增失败!" ,-1);
            return  failedException(e);
        }
    }
@@ -118,34 +112,31 @@ public class NurseryLogEndpoint extends EnvelopRestEndpoint {
        try {
            return success("新增成功",nurseryLogService.addDietRecord(id, eatFood, eatType, enclosure, intake, additionalNotes));
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError( "新增失败!" ,-1);
            return  failedException(e);
        }
    }
    @GetMapping(value = "nurseryDetail")
    @ApiOperation("获取课程记录详情")
    public ObjEnvelop nurseryDetail(@ApiParam(name = "id", value = "id")
    public Envelop nurseryDetail(@ApiParam(name = "id", value = "id")
                                            @RequestParam(value = "id", required = true) String id){
        try {
            return ObjEnvelop.getSuccess("操作成功！",nurseryLogService.nurseryDetail(id));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError( "操作失败！");
            return  failedException(e);
        }
    }
    @GetMapping(value = "findRecordByNurseryLogId")
    @ApiOperation("根据托育日志id查找")
    public ObjEnvelop findRecordByNurseryLogId(@ApiParam(name = "id", value = "id")
    public Envelop findRecordByNurseryLogId(@ApiParam(name = "id", value = "id")
                                                   @RequestParam(value = "id", required = true) String id,
                                               @ApiParam(name = "type", value = "类型 diet饮食记录 course课程记录")
                                               @RequestParam(value = "type", required = true) String type){
        try {
            return nurseryLogService.findRecordByNurseryLogId(id,type);
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError( "操作失败！");
            return  failedException(e);
        }
    }