Merge branch 'dev' of liubing/wlyy2.0 into dev

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

@@ -331,6 +331,8 @@ public class LifeCareOrderDO extends UuidIdentityEntityWithOperator {
     */
    private Integer payStatus;//支付状态
    private String doctorPhone;//医生手机信息
    @Column(name = "number")
    public String getNumber() {
        return number;
@@ -743,4 +745,13 @@ public class LifeCareOrderDO extends UuidIdentityEntityWithOperator {
    public void setPayStatus(Integer payStatus) {
        this.payStatus = payStatus;
    }
    @Transient
    public String getDoctorPhone() {
        return doctorPhone;
    }
    public void setDoctorPhone(String doctorPhone) {
        this.doctorPhone = doctorPhone;
    }
}

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

@@ -158,6 +158,12 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
        }
        // 获取服务次数
        lifeCareOrderDO.setFeeDetailList(getFeeDetails(id));
        if (StringUtils.isNotBlank(lifeCareOrderDO.getDoctor())){
            BaseDoctorDO doctorDO = doctorDao.findById(lifeCareOrderDO.getDoctor());
            if (null!=doctorDO){
                lifeCareOrderDO.setDoctorPhone(doctorDO.getMobile());
            }
        }
        return lifeCareOrderDO;
    }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/security/SecurityMonitoringOrderService.java

@@ -1213,9 +1213,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        else {
            result.put("fall",false);
        }
        if (StringUtils.isNotBlank(topicItem)){
            result = patientSignTopicInfo(result,patient,topicItem);
        }
        result = patientSignTopicInfo(result,patient,topicItem);
        return result;
    }
@@ -1223,7 +1221,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        if (null==result){
            result = new JSONObject();
        }
        if (StringUtils.isNotBlank(topicItem)){
        if (StringUtils.isNotBlank(topicItem)||StringUtils.isBlank(topicItem)){
            if ("preventLost".equals(topicItem)){
                List<DevicePatientDevice> devicePatientDeviceDos = patientDeviceDao.findByUserAndCategoryCode(patient,"4");
                if (devicePatientDeviceDos.size()==0){}
@@ -1278,7 +1276,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                    }
                }
            }
            if ("preventFall".equals(topicItem)){
            if ("preventFall".equals(topicItem)||StringUtils.isBlank(topicItem)){
                List<DevicePatientDevice> devicePatientDeviceDos = patientDeviceDao.findByUserAndCategoryCode(patient,"12");
                if (devicePatientDeviceDos.size()==0){}
                else{
@@ -1298,7 +1296,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                    }
                }
            }
            if ("preventOutOfBed".equals(topicItem)){
            if ("preventOutOfBed".equals(topicItem)||StringUtils.isBlank(topicItem)){
                List<DevicePatientDevice> devicePatientDeviceDos = patientDeviceDao.findByUserAndCategoryCode(patient,"13");
                if (devicePatientDeviceDos.size()==0){}
                else {

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/sign/ArchiveService.java

@@ -81,7 +81,7 @@ public class ArchiveService extends BaseJpaService<ArchiveDO, ArchiveDao> {
    }
    public PageEnvelop<List<Map<String,Object>>> archiveList(String doctorId, int page, int size,Integer signStatus,String name){
        String sql = " select * from ( SELECT a.create_time,p.idcard,p.mobile,p.name,p.sex,p.id,p.photo,CAST(a.sign_status AS char) sign_status ";
        String sql = " select * from ( SELECT a.create_time,p.openid,p.idcard,p.mobile,p.name,p.sex,p.id,p.photo,CAST(a.sign_status AS char) sign_status ";
        String countSql = "SELECT count(*) from ( ";
        String filters = "from wlyy_archive a,base_patient p " +
@@ -97,7 +97,7 @@ public class ArchiveService extends BaseJpaService<ArchiveDO, ArchiveDao> {
        }
        if (signStatus!=null&&signStatus==1){//已签约不按建档查询,只要该居民服务医生就在列表中
            filters+=" UNION " +
                    " SELECT a.create_time,p.idcard,p.mobile,p.name,p.sex,p.id,p.photo,CAST(a.sign_status AS char) sign_status \n" +
                    " SELECT a.create_time,p.openid,p.idcard,p.mobile,p.name,p.sex,p.id,p.photo,CAST(a.sign_status AS char) sign_status \n" +
                    "from wlyy_archive a,base_patient p WHERE  a.patient = p.id and a.sign_status = 1 and EXISTS( " +
                    "SELECT DISTINCT sr.patient from base_service_package_sign_record sr,base_service_package_record r, " +
                    "base_service_package_item i,base_team_member m " +