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

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

common/common-entity/sql记录

@@ -1012,3 +1012,8 @@ alter table base_life_care_order add column doctor_sign_img varchar(3000) DEFAUL
alter table base_life_care_order add column sign_doctor varchar(50) DEFAULT NULL COMMENT '签到医生';
alter table base_life_care_order add column sign_doctor_name varchar(50) DEFAULT NULL COMMENT '签到医生name';
-- 2021-06-07 ysj
alter table base_life_care_order add column conclusion_imgs varchar(3000) DEFAULT NULL COMMENT '小结照片';
alter table base_life_care_order add column conclusion_time datetime DEFAULT NULL COMMENT '小结时间';
alter table base_life_care_order add column conclusion_remark varchar(1200) DEFAULT NULL COMMENT '小结内容';

common/common-entity/src/main/java/com/yihu/jw/entity/care/lifeCare/LifeCareOrderDO.java

@@ -182,9 +182,23 @@ public class LifeCareOrderDO extends UuidIdentityEntityWithOperator {
     */
    private String completeRemark;
    /**
     * 小结照片，最多6张，逗号分隔
     */
    private String conclusionImgs;
    /**
     * 服务小结
     */
    private String conclusionRemark;
    /**
     * 工单结时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date conclusionTime;
    /**
     * 工单状态：
     * 待服务 1、已完成 2 、已取消 -1
     * 待服务 1、已完成 2 、已取消 -1 已签到 3、
     */
    private Integer status;
@@ -614,6 +628,7 @@ public class LifeCareOrderDO extends UuidIdentityEntityWithOperator {
    }
    @Column(name = "doctor_sign_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getDoctorSignTime() {
        return doctorSignTime;
    }
@@ -662,4 +677,32 @@ public class LifeCareOrderDO extends UuidIdentityEntityWithOperator {
    public void setSignDoctorName(String signDoctorName) {
        this.signDoctorName = signDoctorName;
    }
    @Column(name = "conclusion_imgs")
    public String getConclusionImgs() {
        return conclusionImgs;
    }
    public void setConclusionImgs(String conclusionImgs) {
        this.conclusionImgs = conclusionImgs;
    }
    @Column(name = "conclusion_remark")
    public String getConclusionRemark() {
        return conclusionRemark;
    }
    public void setConclusionRemark(String conclusionRemark) {
        this.conclusionRemark = conclusionRemark;
    }
    @Column(name = "conclusion_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getConclusionTime() {
        return conclusionTime;
    }
    public void setConclusionTime(Date conclusionTime) {
        this.conclusionTime = conclusionTime;
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/lifeCare/DoctorLifeCareEndpoint.java

@@ -89,7 +89,7 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
            @ApiParam(value = "附件", name = "completeImgs")
            @RequestParam(value = "completeImgs", required = false) String completeImgs,
            @ApiParam(value = "完成服务记录", name = "completeRemark")
            @RequestParam(value = "completeRemark", required = true) String completeRemark,
            @RequestParam(value = "completeRemark", required = false) String completeRemark,
            @ApiParam(value = "doctorId", name = "doctorId")
            @RequestParam(value = "doctorId", required = true) String doctorId) {
        try {
@@ -107,6 +107,31 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
        }
    }
    @PostMapping("updateConclusion")
    @ApiOperation("编辑保存服务工单小结")
    public Envelop updateConclusion(
            @ApiParam(value = "工单id", name = "orderId")
            @RequestParam(value = "orderId", required = true) String orderId,
            @ApiParam(value = "附件", name = "conclusionImgs")
            @RequestParam(value = "conclusionImgs", required = false) String conclusionImgs,
            @ApiParam(value = "完成服务记录", name = "conclusionRemark")
            @RequestParam(value = "conclusionRemark", required = true) String conclusionRemark,
            @ApiParam(value = "doctorId", name = "doctorId")
            @RequestParam(value = "doctorId", required = true) String doctorId) {
        try {
            Integer result = lifeCareOrderService.updateConclusion(orderId, conclusionImgs, conclusionRemark,doctorId);
            if(result == 1){
                return Envelop.getError( "签到后才能登记服务小结" ,-1);
            }
            if(result == 2){
                return Envelop.getError( "只有工单的签到者才能登记服务小结" ,-1);
            }
            return Envelop.getSuccess("登记成功");
        } catch (Exception e) {
            return failedException(e);
        }
    }
    @GetMapping(value = "getPatientOrderList")
    @ApiOperation(value = "医生查看居民工单列表")
    public PageEnvelop getPatientOrderList(

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/lifeCare/LifeCareOrderService.java

@@ -77,6 +77,27 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
    @Autowired
    private OrderNoService orderNoService;
    /**
     * 记录完成情况
     * @param orderId
     * @param conclusionImgs
     * @param conclusionRemark
     */
    public Integer updateConclusion(String orderId,String conclusionImgs,String conclusionRemark,String doctorId){
        LifeCareOrderDO lifeCareOrderDO = lifeCareOrderDao.findOne(orderId);
        if(!lifeCareOrderDO.getStatus().equals(LifeCareOrderDO.Status.signIn.getType())){
            return 1;
        }
        if(!doctorId.equals(lifeCareOrderDO.getSignDoctor())){
            return 2;
        }
        lifeCareOrderDO.setConclusionImgs(conclusionImgs);
        lifeCareOrderDO.setConclusionRemark(conclusionRemark);
        lifeCareOrderDO.setConclusionTime(new Date());
        lifeCareOrderDao.save(lifeCareOrderDO);
        return 0;
    }
    /**
     * 记录完成情况
     * @param orderId