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

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

common/common-entity/sql记录

@@ -1009,4 +1009,6 @@ alter table base_life_care_order add column doctor_sign_time datetime DEFAULT NU
alter table base_life_care_order add column doctor_sign_way tinyint(1) DEFAULT NULL COMMENT '医生签到方式：1-定位，2-扫码，3-拍照';
alter table base_life_care_order add column doctor_sign_location varchar(50) DEFAULT NULL COMMENT '医生签到位置，记录详细地址';
alter table base_life_care_order add column doctor_sign_img varchar(3000) DEFAULT NULL COMMENT '医生签到照片';
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';

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

@@ -278,6 +278,14 @@ public class LifeCareOrderDO extends UuidIdentityEntityWithOperator {
     * 医生签到照片
     */
    private String doctorSignImg;
    /**
     *
     */
    private String signDoctor;
    /**
     * 签到医生姓名
     */
    private String signDoctorName;
    @Column(name = "number")
    public String getNumber() {
@@ -636,4 +644,22 @@ public class LifeCareOrderDO extends UuidIdentityEntityWithOperator {
    public void setDoctorSignImg(String doctorSignImg) {
        this.doctorSignImg = doctorSignImg;
    }
    @Column(name = "sign_doctor")
    public String getSignDoctor() {
        return signDoctor;
    }
    public void setSignDoctor(String signDoctor) {
        this.signDoctor = signDoctor;
    }
    @Column(name = "sign_doctor_name")
    public String getSignDoctorName() {
        return signDoctorName;
    }
    public void setSignDoctorName(String signDoctorName) {
        this.signDoctorName = signDoctorName;
    }
}

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

@@ -93,7 +93,13 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
            @ApiParam(value = "doctorId", name = "doctorId")
            @RequestParam(value = "doctorId", required = true) String doctorId) {
        try {
           lifeCareOrderService.completeOrder(orderId, completeImgs, completeRemark,doctorId);
            Integer result = lifeCareOrderService.completeOrder(orderId, completeImgs, completeRemark,doctorId);
            if(result == 1){
                return Envelop.getError( "签到后才能记录服务" ,-1);
            }
            if(result == 2){
                return Envelop.getError( "只有工单的签到者才能记录服务" ,-1);
            }
            return Envelop.getSuccess("记录成功");
        } catch (Exception e) {
            e.printStackTrace();
@@ -126,7 +132,7 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
                return Envelop.getError(result.getString(ResponseContant.resultMsg),-1);
            }
            return Envelop.getSuccess(result.getString("orderId"));
            return success(result);
        }catch (Exception e){
            e.printStackTrace();
            return failedException(e);
@@ -139,6 +145,8 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
    public Envelop signIn(
            @ApiParam(value = "工单id", name = "orderId")
            @RequestParam(value = "orderId", required = true) String orderId,
            @ApiParam(value = "医生id", name = "doctorId")
            @RequestParam(value = "doctorId", required = true) String doctorId,
            @ApiParam(value = "签到时间", name = "signTime")
            @RequestParam(value = "signTime", required = false) String signTime,
            @ApiParam(value = "签到方式：1-定位，2-扫码，3-拍照，4-二维码", name = "signWay")
@@ -150,11 +158,11 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
            @ApiParam(value = "二维码内容", name = "twoDimensionalCode")
            @RequestParam(value = "twoDimensionalCode", required = false) String twoDimensionalCode) {
        try {
            LifeCareOrderDO result = lifeCareOrderService.signIn(orderId, signTime, signWay, signLocation, signImg,twoDimensionalCode,getUID());
            if (result!=null) {
            LifeCareOrderDO result = lifeCareOrderService.signIn(orderId, signTime, signWay, signLocation, signImg,twoDimensionalCode,doctorId);
            if (result==null) {
                return Envelop.getError("签到失败");
            }
            return Envelop.getSuccess("签到成功");
            return success(result);
        } catch (Exception e) {
            return failedException(e);
        }

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

@@ -83,18 +83,23 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
     * @param complereImgs
     * @param completeRemark
     */
    public void completeOrder(String orderId,String complereImgs,String completeRemark,String doctorId){
    public Integer completeOrder(String orderId,String complereImgs,String completeRemark,String doctorId){
        BaseDoctorDO doctorDO = doctorDao.findById(doctorId);
        LifeCareOrderDO lifeCareOrderDO = lifeCareOrderDao.findOne(orderId);
        if(lifeCareOrderDO.getStatus().equals(LifeCareOrderDO.Status.waitForAccept.getType())){
            lifeCareOrderDO.setDoctor(doctorId);
            lifeCareOrderDO.setDoctorName(doctorDO.getName());
            lifeCareOrderDO.setStatus(2);
            lifeCareOrderDO.setCompleteImgs(complereImgs);
            lifeCareOrderDO.setCompleteRemark(completeRemark);
            lifeCareOrderDO.setCompleteTime(new Date());
            lifeCareOrderDao.save(lifeCareOrderDO);
        if(!lifeCareOrderDO.getStatus().equals(LifeCareOrderDO.Status.signIn.getType())){
            return 1;
        }
        if(!doctorId.equals(lifeCareOrderDO.getSignDoctor())){
            return 2;
        }
        lifeCareOrderDO.setDoctor(doctorId);
        lifeCareOrderDO.setDoctorName(doctorDO.getName());
        lifeCareOrderDO.setStatus(2);
        lifeCareOrderDO.setCompleteImgs(complereImgs);
        lifeCareOrderDO.setCompleteRemark(completeRemark);
        lifeCareOrderDO.setCompleteTime(new Date());
        lifeCareOrderDao.save(lifeCareOrderDO);
        return 0;
    }
@@ -429,18 +434,19 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
            if (type==1||type==2){
                //本人或家人代发起
                BasePatientDO patientDO = patientDao.findById(proxyPatient);
                jsonObjectParam.put("proxyPatient",proxyPatient);
                jsonObjectParam.put("proxyPatientName",patientDO.getName());
                jsonObjectParam.put("proxyPatientPhone",patientDO.getMobile());
                orderDO.setProxyPatient(proxyPatient);
                orderDO.setProxyPatientName(patientDO.getName());
                orderDO.setProxyPatientPhone(patientDO.getMobile());
            }else if (type==3) {
                //医生代发起
                BaseDoctorDO doctorDO = doctorDao.findById(proxyPatient);
                jsonObjectParam.put("proxyPatient",proxyPatient);
                jsonObjectParam.put("proxyPatientName",doctorDO.getName());
                jsonObjectParam.put("proxyPatientPhone",doctorDO.getMobile());
                orderDO.setProxyPatient(proxyPatient);
                orderDO.setProxyPatientName(doctorDO.getName());
                orderDO.setProxyPatientPhone(doctorDO.getMobile());
            }
        } catch (Exception e) {
            e.printStackTrace();
            result.put(ResponseContant.resultFlag, ResponseContant.fail);
            String failMsg = "参数转换成JSON对象异常：" + e.getMessage();
            result.put(ResponseContant.resultMsg, failMsg);
@@ -591,6 +597,11 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
    public LifeCareOrderDO signIn(String orderId, String signTime, Integer signWay, String signLocation,
                             String signImg, String twoDimensionalCode,String doctorId) throws Exception {
        LifeCareOrderDO lifeCareOrderDO = this.lifeCareOrderDao.findOne(orderId);
        if(!"1".equals(lifeCareOrderDO.getStatus())){
            //待服务状态才能签到
            logger.info("签到失败"+lifeCareOrderDO.getId()+":"+lifeCareOrderDO.getStatus());
            return null;
        }
        lifeCareOrderDO.setDoctorSignTime(DateUtil.strToDate(signTime));
        lifeCareOrderDO.setDoctorSignWay(signWay);
        // 签到方式-2扫码时，需要去解析地址
@@ -599,6 +610,8 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
        //3 已签到
        lifeCareOrderDO.setStatus(3);
        BaseDoctorDO doctorDO = doctorDao.findById(doctorId);
        lifeCareOrderDO.setSignDoctor(doctorId);
        lifeCareOrderDO.setSignDoctorName(doctorDO.getName());
        lifeCareOrderDO.setUpdateTime(new Date());
        lifeCareOrderDO.setUpdateUser(doctorId);
        lifeCareOrderDO.setUpdateUserName(doctorDO.getName());