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

business/base-service/src/main/java/com/yihu/jw/patient/service/BasePatientService.java

@@ -291,7 +291,19 @@ public class BasePatientService<T, R extends CrudRepository> extends BaseJpaServ
            basePatientDO1.setAddress(basePatientDO.getAddress());
            basePatientDO1.setPhoto(basePatientDO.getPhoto());
            basePatientDO1.setArchiveStatus(basePatientDO.getArchiveStatus());
            if("hz_yyyzh_wx".equalsIgnoreCase(wxId)){//杭州医养头像初始化
                if (org.apache.commons.lang3.StringUtils.isBlank(basePatientDO1.getPhoto())){
                    String hzPhoto= getHzAvatar(1,null,basePatientDO1.getArchiveType()+"",null==basePatientDO1.getSex()?"":basePatientDO1.getSex()+"",basePatientDO1.getIdcard());
                    basePatientDO1.setPhoto(hzPhoto);
                }else{
                    String sql = " select count(id) from wlyy_hospital_sys_dict where dict_name='hz_default_avatar' and dict_value='"+basePatientDO1.getPhoto()+"' ";
                    Integer defaultAvatar =  jdbcTemplate.queryForObject(sql,Integer.class);
                    if (defaultAvatar>0){
                        String hzPhoto= getHzAvatar(1,null,basePatientDO1.getArchiveType()+"",null==basePatientDO1.getSex()?"":basePatientDO1.getSex()+"",basePatientDO1.getIdcard());
                        basePatientDO1.setPhoto(hzPhoto);
                    }
                }
            }
            // 保存修改的居民信息
            this.save(basePatientDO1);
        }
@@ -344,6 +356,20 @@ public class BasePatientService<T, R extends CrudRepository> extends BaseJpaServ
            if(StringUtils.isNotBlank(basePatientDO.getYktId())){
                basePatientDO1.setYktId(basePatientDO.getYktId());
            }
            if("hz_yyyzh_wx".equalsIgnoreCase(wxId)){//杭州医养头像初始化
                if (org.apache.commons.lang3.StringUtils.isBlank(basePatientDO1.getPhoto())){
                    String hzPhoto= getHzAvatar(1,null,basePatientDO1.getArchiveType()+"",null==basePatientDO1.getSex()?"":basePatientDO1.getSex()+"",basePatientDO1.getIdcard());
                    basePatientDO1.setPhoto(hzPhoto);
                }else{
                    String sql = " select count(id) from wlyy_hospital_sys_dict where dict_name='hz_default_avatar' and dict_value='"+basePatientDO1.getPhoto()+"' ";
                    Integer defaultAvatar =  jdbcTemplate.queryForObject(sql,Integer.class);
                    if (defaultAvatar>0){
                        String hzPhoto= getHzAvatar(1,null,basePatientDO1.getArchiveType()+"",null==basePatientDO1.getSex()?"":basePatientDO1.getSex()+"",basePatientDO1.getIdcard());
                        basePatientDO1.setPhoto(hzPhoto);
                    }
                }
            }
            // 保存修改的居民信息
            basePatientDao.save(basePatientDO1);
        }
@@ -708,5 +734,93 @@ public class BasePatientService<T, R extends CrudRepository> extends BaseJpaServ
        return PageEnvelop.getSuccessListWithPage("success",list,page,size,cou);
    }
    /**
     *
     * 获取医养默认头像
     * @param user 1居民2员工(医生、助老员等)
     * @param doctorLevel
     * @param archiveType
     * @param sex
     * @param idcard
     * @return
     */
    public String getHzAvatar(Integer user,String doctorLevel,String archiveType,String sex,String idcard){
        String avatar = null;
        String flag = "";
        if (org.apache.commons.lang3.StringUtils.isBlank(sex)&& org.apache.commons.lang3.StringUtils.isNotBlank(idcard)){
            sex = IdCardUtil.getSexForIdcard_new(idcard);
        }
        if ("1".equals(user)){
            if (org.apache.commons.lang3.StringUtils.isNotBlank(archiveType)){
                flag = "1"+"_"+archiveType;
            }
            if (org.apache.commons.lang3.StringUtils.isNotBlank(sex)&&!"3".equals(sex)){
                flag += "_"+sex;
            }else {
                flag += "_1";
            }
        }
        else if ("2".equals(user)){
            if (org.apache.commons.lang3.StringUtils.isNotBlank(doctorLevel)){
                flag = "2"+"_"+doctorLevel;
            }
            if (org.apache.commons.lang3.StringUtils.isNotBlank(sex)&&!"3".equals(sex)){
                flag += "_"+sex;
            }else {
                flag += "_1";
            }
        }
        String dictName="";
        switch (flag){
            case "1-1-1"://老人男
                dictName="laorennan";
                break;
            case "1-1-2"://老人女
                dictName="laorennv";
                break;
            case "1-2-1"://新生儿男
                dictName="xinshengernan";
                break;
            case "1-2-2"://新生儿女
                dictName="xinshengernv";
                break;
            case "1-3-1"://家属男
                dictName="jiashunan";
                break;
            case "1-3-2"://家属女
                dictName="jiashunv";
                break;
            case "2-1-1"://医生男
                dictName="yishengnan";
                break;
            case "2-1-2"://医生女
                dictName="yishengnv";
                break;
            case "2-2-1"://社工男
                dictName="shegongnan";
                break;
            case "2-2-2"://社工女
                dictName="shegongnv";
                break;
            case "2-3-1"://教师男
                dictName="jiaoshinan";
                break;
            case "2-3-2"://教师女
                dictName="jiaoshinv";
                break;
            case "2-4-1"://助老员男
                dictName="shegongnan";
                break;
            case "2-4-2"://助老员女
                dictName="shegongnv";
                break;
            default:
                dictName="jiashunan";
                break;
        }
        String sql = " select dict_value from wlyy_hospital_sys_dict where dict_name='hz_default_avatar' and dict_code='"+dictName+"' ";
        avatar = jdbcTemplate.queryForObject(sql,String.class);
        return avatar;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/servicePackage/BasePatientHelperDO.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.base.servicePackage;
import com.yihu.jw.entity.IntegerIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
/**
@@ -11,6 +12,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_patient_helper")
@SequenceGenerator(name="id_generated", sequenceName="seq_base_patient_helper")
public class BasePatientHelperDO extends IntegerIdentityEntityWithOperator {
    private String patient;

common/common-entity/src/main/java/com/yihu/jw/entity/care/birthday/BirthDayWishesToPatient.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@@ -13,6 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "birthday_wishes_to_patient")
@SequenceGenerator(name="id_generated", sequenceName="seq_birthday_wishes_to_patient")
public class BirthDayWishesToPatient extends IdEntity {

common/common-entity/src/main/java/com/yihu/jw/entity/care/birthday/BirthdayWishesTemplate.java

@@ -6,6 +6,7 @@ import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@@ -17,6 +18,7 @@ import java.util.Date;
@Entity
@Table(name = "wlyy_birthday_wishes_template")
@SequenceGenerator(name="id_generated", sequenceName="seq_wlyy_birthday_wishes_template")
public class BirthdayWishesTemplate extends IdEntity {
    private String code;//业务主键

common/common-entity/src/main/java/com/yihu/jw/entity/care/contacts/PatientSosContactsDO.java

@@ -4,10 +4,7 @@ package com.yihu.jw.entity.care.contacts;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.Date;
/**
@@ -16,6 +13,7 @@ import java.util.Date;
 */
@Entity
@Table(name="base_patient_sos_contacts")
@SequenceGenerator(name="id_generated", sequenceName="seq_base_patient_sos_contacts")
public class PatientSosContactsDO extends IdEntity {
    private String patient;
    private String sosName; //紧急联系人

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/BasePatientOutBed.java

@@ -5,6 +5,7 @@ import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@@ -13,6 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name="base_sleep_patient_out_bed")
@SequenceGenerator(name="id_generated", sequenceName="seq_base_patient_sos_contacts")
public class BasePatientOutBed extends IdEntity {
    private String patient ;
    private String deviceSn;

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/BasePatientStepDo.java

@@ -5,6 +5,7 @@ import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@@ -13,6 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name="base_patient_step")
@SequenceGenerator(name="id_generated", sequenceName="seq_base_patient_step")
public class BasePatientStepDo extends IdEntity{
    private String patient;
    private String deviceSn;

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/BaseSleepDeviceReport.java

@@ -5,6 +5,7 @@ import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@@ -14,6 +15,7 @@ import java.util.Date;
 */
@Entity
@Table(name="base_sleep_device")
@SequenceGenerator(name="id_generated", sequenceName="seq_base_sleep_device")
public class BaseSleepDeviceReport extends IdEntity {
    public String patient;

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/BaseSleepNightRecord.java

@@ -5,6 +5,7 @@ import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@@ -13,6 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name="base_sleep_night_record")
@SequenceGenerator(name="id_generated", sequenceName="seq_base_sleep_night_record")
public class BaseSleepNightRecord extends IdEntity {
    private String patient ;
    private String deviceSn;

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/BaseSleepPlanDetail.java

@@ -3,10 +3,7 @@ package com.yihu.jw.entity.care.device;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.Date;
import java.util.List;
@@ -15,6 +12,7 @@ import java.util.List;
 */
@Entity
@Table(name="base_sleep_plan_detail")
@SequenceGenerator(name="id_generated", sequenceName="seq_base_sleep_plan_detail")
public class BaseSleepPlanDetail extends IdEntity {
    private String  patient;
    private String  deviceSn;

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/DeviceDataPushLog.java

@@ -4,6 +4,7 @@ import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@@ -12,6 +13,7 @@ import java.util.Date;
 */
@Entity
@Table(name="device_data_push_log")
@SequenceGenerator(name="id_generated", sequenceName="seq_device_data_push_log")
public class DeviceDataPushLog extends IdEntity {
    private String patient;

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/PatientSafeAreaConfirm.java

@@ -5,6 +5,7 @@ import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@@ -13,6 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name="wlyy_patient_safe_area_confirm")
@SequenceGenerator(name="id_generated", sequenceName="seq_wlyy_patient_safe_area_confirm")
public class PatientSafeAreaConfirm extends IdEntity {
    private String patient;

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/PatientSafeAreaDO.java

@@ -5,6 +5,7 @@ import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@@ -13,6 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name="wlyy_patient_safe_area")
@SequenceGenerator(name="id_generated", sequenceName="seq_wlyy_patient_safe_area")
public class PatientSafeAreaDO extends IdEntity {
    private String patient;

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/YsConfigDo.java

@@ -4,6 +4,7 @@ import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
/**
@@ -11,6 +12,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "dm_ys_config")
@SequenceGenerator(name="id_generated", sequenceName="seq_dm_ys_config")
public class YsConfigDo extends IdEntity {
    private Integer configId; //配置编号

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/YsDeviceDo.java

@@ -5,6 +5,7 @@ import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
/**
@@ -12,6 +13,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "ys_device")
@SequenceGenerator(name="id_generated", sequenceName="seq_ys_device")
public class YsDeviceDo extends IdEntity {
    private String deviceSn;

common/common-entity/src/main/java/com/yihu/jw/entity/care/securitymonitoring/BaseEmergencyWarnLogDO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.xml.crypto.Data;
@@ -14,6 +15,7 @@ import java.util.Date;
 */
@Entity
@Table(name="base_emergency_warn_log")
@SequenceGenerator(name="id_generated", sequenceName="seq_base_emergency_warn_log")
public class BaseEmergencyWarnLogDO extends IdEntity {
    public String orderId;

server/svr-authentication/src/main/java/com/yihu/jw/security/service/RegisterService.java

@@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -47,6 +48,8 @@ public class RegisterService {
    private StringRedisTemplate redisTemplate;
    @Value("${wechat.id}")
    private String wechatId;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private YkyyService ykyyService;
@@ -149,6 +152,14 @@ public class RegisterService {
            if(StringUtils.isNoneBlank(openid)){
                patient.setOpenid(openid);
            }
            if("hz_yyyzh_wx".equalsIgnoreCase(wechatId)){//杭州医养头像初始化
                if(StringUtils.isBlank(patient.getPhoto())){
                    String sql = " select dict_value from wlyy_hospital_sys_dict where dict_name='hz_default_avatar' and dict_code='jiashunan' ";
                    String hzPhoto = jdbcTemplate.queryForObject(sql,String.class);
                    patient.setPhoto(hzPhoto);
                }
            }
            BasePatientDO temp = basePatientDao.save(patient);
            PatientMedicareCardDO medicareCardDO = new PatientMedicareCardDO();

svr/svr-base/src/main/java/com/yihu/jw/base/service/doctor/BaseDoctorService.java

@@ -40,6 +40,7 @@ import com.yihu.jw.hospital.prescription.service.entrance.EntranceService;
import com.yihu.jw.hospital.prescription.service.entrance.XzzxEntranceService;
import com.yihu.jw.hospital.prescription.service.entrance.YkyyEntranceService;
import com.yihu.jw.org.dao.BaseOrgDao;
import com.yihu.jw.patient.service.BasePatientService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.util.common.IdCardUtil;
@@ -142,6 +143,8 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
    private WlyyHospitalSysDictDao wlyyHospitalSysDictDao;
    @Autowired
    private BaseTeamDao baseTeamDao;
    @Autowired
    private BasePatientService basePatientService;
    /**
@@ -473,6 +476,19 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
                baseDoctorvo.setChargeType("12");
                baseDoctorvo.setBirthday(IdCardUtil.getBirthdayForIdcard(baseDoctorvo.getIdcard()));
                baseDoctorvo.setPassword(MD5.md5Hex(baseDoctorvo.getIdcard().substring(12, 18) + "{" + baseDoctorvo.getSalt() + "}"));
                if("hz_yyyzh_wx".equalsIgnoreCase(wxId)){//杭州医养头像初始化
                  if (org.apache.commons.lang3.StringUtils.isBlank(baseDoctorvo.getPhoto())){
                      String hzPhoto= basePatientService.getHzAvatar(2,baseDoctorDO.getLevel()+"",null,null==baseDoctorDO.getSex()?"":baseDoctorDO.getSex()+"",baseDoctorDO.getIdcard());
                      baseDoctorvo.setPhoto(hzPhoto);
                  }else{
                      String sql = " select count(id) from wlyy_hospital_sys_dict where dict_name='hz_default_avatar' and dict_value='"+baseDoctorDO.getPhoto()+"' ";
                      Integer defaultAvatar =  jdbcTemplate.queryForObject(sql,Integer.class);
                      if (defaultAvatar>0){
                          String hzPhoto= basePatientService.getHzAvatar(2,baseDoctorDO.getLevel()+"",null,null==baseDoctorDO.getSex()?"":baseDoctorDO.getSex()+"",baseDoctorDO.getIdcard());
                          baseDoctorvo.setPhoto(hzPhoto);
                      }
                  }
                }
                baseDoctorDO = baseDoctorDao.save(baseDoctorvo);
                if ("xm_zsyy_wx".equalsIgnoreCase(wxId)){
@@ -668,6 +684,19 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
            result.put("response",ConstantUtils.FAIL);
            return result.toJSONString();
        }
        if("hz_yyyzh_wx".equalsIgnoreCase(wxId)){//杭州医养头像初始化
            if (org.apache.commons.lang3.StringUtils.isBlank(baseDoctorDO.getPhoto())){
                String hzPhoto= basePatientService.getHzAvatar(2,baseDoctorDO.getLevel()+"",null,null==baseDoctorDO.getSex()?"":baseDoctorDO.getSex()+"",baseDoctorDO.getIdcard());
                baseDoctorDO.setPhoto(hzPhoto);
            }else{
                String sql = " select count(id) from wlyy_hospital_sys_dict where dict_name='hz_default_avatar' and dict_value='"+baseDoctorDO.getPhoto()+"' ";
                Integer defaultAvatar =  jdbcTemplate.queryForObject(sql,Integer.class);
                if (defaultAvatar>0){
                    String hzPhoto= basePatientService.getHzAvatar(2,baseDoctorDO.getLevel()+"",null,null==baseDoctorDO.getSex()?"":baseDoctorDO.getSex()+"",baseDoctorDO.getIdcard());
                    baseDoctorDO.setPhoto(hzPhoto);
                }
            }
        }
        this.save(baseDoctorDO);
        DoctorMappingDO doctorMappingDO = null;
        if (!StringUtils.isEmpty(doctorMappingCode)){

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/consult/DoctorConsultEndpoint.java

@@ -122,6 +122,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = "videoInviteMiniProgram")
    @ApiOperation(value = "医生端：发起/断开 会话小程序视频邀请", notes = "医生端：发起/断开 会话小程序视频邀请")
    @ObserverRequired
    public Envelop videoInviteMiniProgram(@ApiParam(name = "sender_id", value = "发起人")
                                          @RequestParam(value = "sender_id",required = true) String sender_id,
                                          @ApiParam(name = "reciver_id", value = "接收人")

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/device/DeviceController.java

@@ -2,6 +2,7 @@ package com.yihu.jw.care.endpoint.device;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.care.aop.ObserverRequired;
import com.yihu.jw.care.endpoint.BaseController;
import com.yihu.jw.care.service.device.DeviceDetailService;
import com.yihu.jw.care.service.device.DeviceService;
@@ -34,6 +35,7 @@ public class DeviceController extends BaseController {
     */
    @ApiOperation("清除设备失联状态")
    @RequestMapping(value = "updateContactStatus",method = {RequestMethod.GET,RequestMethod.POST})
    @ObserverRequired
    public String updateContactStatus(@ApiParam(name = "deviceSn", value = "设备sn码")
                                      @RequestParam(value = "deviceSn", required = true) String deviceSn) {
        try {

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/device/PatientDeviceController.java

@@ -244,6 +244,7 @@ public class PatientDeviceController extends BaseController {
     */
    @ApiOperation("设备删除")
    @RequestMapping(value = "DeletePatientDevice",method = {RequestMethod.GET,RequestMethod.POST})
    @ObserverRequired
    public String delete(@ApiParam(name = "id", value = "删除设备关联ID")
                         @RequestParam(value = "id", required = true) String id) {
        try {
@@ -329,6 +330,7 @@ public class PatientDeviceController extends BaseController {
    @ApiOperation("更新智能手环设备安全区域")
    @RequestMapping(value = "updateDeviceFenceArea",method = RequestMethod.GET)
    @ObserverRequired
    public String updateDeviceFenceArea(@ApiParam(name = "patient",value = "患者")
                                        @RequestParam(value = "patient",required = false)String patient,
                                        @ApiParam(name = "deviceSn",value = "设备sn码")
@@ -394,6 +396,7 @@ public class PatientDeviceController extends BaseController {
    @ApiOperation("修改心率呼吸率报警阈值")
    @RequestMapping(value = "sleepDeviceEdit",method = RequestMethod.GET)
    @ObserverRequired
    public String sleepDeviceEdit(@ApiParam(name = "deviceSn",value = "睡眠带MAC 去除符号:")
                                        @RequestParam(value = "deviceSn",required = true)String deviceSn,
                                        @ApiParam(name = "heart_check_enable",value = "心率异常检查开关0是关，1是开 ")

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/doctor/DoctorToDoWorkEndpoint.java

@@ -86,7 +86,7 @@ public class DoctorToDoWorkEndpoint extends EnvelopRestEndpoint {
    /*************************************助老员部分*************************************************/
    @GetMapping(value = "helper/todowork")
    @ApiOperation("待办工作")
    public ObjEnvelop helperMessages(@ApiParam(name = "serviceSype", value = "工作类型： 生活照料，安防监护=preventLost，紧急救助=emergencyAssistance，生活照料=fifeCare")
    public ObjEnvelop helperTodoWorl(@ApiParam(name = "serviceSype", value = "工作类型： 生活照料，安防监护=preventLost，紧急救助=emergencyAssistance，生活照料=fifeCare")
                               @RequestParam(value = "serviceSype", required = false) String serviceSype,
                               @ApiParam(name = "id", value = "查看详情需要传id")
                               @RequestParam(value = "id", required = false) String id,
@@ -98,7 +98,7 @@ public class DoctorToDoWorkEndpoint extends EnvelopRestEndpoint {
            if(permissionService.noPermission(1,param)){
                return ObjEnvelop.getError("该操作没有权限");
            }
            return ObjEnvelop.getSuccess("查询成功",doctorMessageService.getHelperPreventLost(doctor,id,serviceSype));
            return ObjEnvelop.getSuccess("查询成功",doctorMessageService.helperTodoWork(doctor,id,serviceSype));
        }catch (Exception e){
            return failedObjEnvelopException2(e);
        }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/sign/SignEndpoint.java

@@ -673,7 +673,7 @@ public class SignEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = "helper/addPatient")
    @ApiOperation(value = "助老员添加监护居民")
    public Envelop helperAddPatient(
            @ApiParam(name = "patient",value = "添加居民id",required = true)
            @ApiParam(name = "patient",value = "添加居民id多个逗号隔开",required = true)
            @RequestParam(value = "patient")String patient,
            @ApiParam(name = "doctor",value = "当前操作助老员id",required = true)
            @RequestParam(value = "doctor")String doctor
@@ -689,7 +689,7 @@ public class SignEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = "helper/delPatient")
    @ApiOperation(value = "助老员删除监护居民")
    public Envelop helperDelPatient(
            @ApiParam(name = "patient",value = "添加居民id",required = true)
            @ApiParam(name = "patient",value = "删除居民id多个逗号隔开",required = true)
            @RequestParam(value = "patient")String patient,
            @ApiParam(name = "doctor",value = "当前操作助老员id",required = true)
            @RequestParam(value = "doctor")String doctor
@@ -736,6 +736,8 @@ public class SignEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "signStatus",required = false) Integer signStatus,
            @ApiParam(name = "name", value = "居民姓名", required = false)
            @RequestParam(value = "name",required = false) String name,
            @ApiParam(name = "filterMyPatient", value = "过滤掉已添加的患者", required = false)
            @RequestParam(value = "filterMyPatient",required = false) String filterMyPatient,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
@@ -744,7 +746,7 @@ public class SignEndpoint extends EnvelopRestEndpoint {
            if (StringUtils.isBlank(doctorId)&&StringUtils.isBlank(name)){
                return PageEnvelop.getError("请求参数错误");
            }
            return archiveService.helperArchiveList(doctorId,hospital,page,size,signStatus,name);
            return archiveService.helperArchiveList(doctorId,hospital,page,size,signStatus,name,filterMyPatient);
        }catch (Exception e){
            return failedPageEnvelopException2(e);
        }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/visit/VisitEndpoint.java

@@ -146,9 +146,15 @@ public class VisitEndpoint extends EnvelopRestEndpoint {
                                 @ApiParam(name = "visitContent", value = "走访记录")
                                 @RequestParam(value = "visitContent", required = true) String visitContent,
                                 @ApiParam(name = "visitImg", value = "走访图片")
                                 @RequestParam(value = "visitImg", required = true) String visitImg) {
                                 @RequestParam(value = "visitImg", required = true) String visitImg,
                                 @ApiParam(name = "deviceMaintenance", value = "设备维护")
                                 @RequestParam(value = "deviceMaintenance", required = false) String deviceMaintenance,
                                 @ApiParam(name = "health", value = "健康情况")
                                 @RequestParam(value = "health", required = false) String health,
                                 @ApiParam(name = "lifeConsult", value = "生活咨询")
                                 @RequestParam(value = "lifeConsult", required = false) String lifeConsult) {
        try {
            baseVisitService.adminAddVisit(doctor,patient,visitContent,visitImg);
            baseVisitService.adminAddVisit(doctor,patient,visitContent,visitImg,deviceMaintenance,health,lifeConsult);
            return Envelop.getSuccess("操作成功");
        } catch (Exception e) {
            return failedException2(e);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/assistance/EmergencyAssistanceService.java

@@ -1282,9 +1282,9 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        if (StringUtils.isNotBlank(orderType)){
            List<String> orderTypes = Arrays.asList(orderType.split(",").clone());
            if (orderTypes.contains("20")){
                sql += "select '20' as OrderType,ord.id,ord.patient,ord.patient_name,ord.doctor,ord.status,ord.doctor_name," +
                sql += "select '20' as OrderType,ord.id,ord.patient,ord.patient_name patientName,ord.doctor,ord.status,ord.doctor_name," +
                        "'紧急呼叫' as serve_desc,DATE_FORMAT(ord.create_time,'%Y-%m-%d %H:%i:%S') create_time ,case p.sex when 1 then '男' when 2 then '女' else p.sex end as sex," +
                        " TIMESTAMPDIFF(YEAR,p.birthday,now()) as age " +
                        " TIMESTAMPDIFF(YEAR,p.birthday,now()) as age,ord.order_source orderSource,p.mobile,p.photo " +
                        "from base_emergency_assistance_order ord  INNER JOIN base_patient p on ord.patient = p.id  INNER JOIN base_patient_helper ph on p.id = ph.patient and ph.del=1  " +
                        " where ph.doctor='"+doctor+"' "+filter;
            }
@@ -1292,16 +1292,16 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
                sql += " UNION ";
            }
            if (orderTypes.contains("22")){
                sql += " select  '22' as 'OrderType',ord.id,ord.patient,ord.patient_name,ord.doctor,ord.status,ord.doctor_name," +
                sql += " select  '22' as 'OrderType',ord.id,ord.patient,ord.patient_name patientName,ord.doctor,ord.status,ord.doctor_name," +
                        "ord.serve_desc,DATE_FORMAT(ord.create_time,'%Y-%m-%d %H:%i:%S') create_time ,case p.sex when 1 then '男' when 2 then '女' else p.sex end as sex, " +
                        "TIMESTAMPDIFF(YEAR,p.birthday,now()) as age from base_security_monitoring_order ord " +
                        "TIMESTAMPDIFF(YEAR,p.birthday,now()) as age,ord.order_source orderSource,p.mobile,p.photo  from base_security_monitoring_order ord " +
                        " INNER JOIN base_patient p on ord.patient = p.id INNER JOIN base_patient_helper ph on p.id = ph.patient and ph.del=1 " +
                        " where ph.doctor='"+doctor+"'  "+filter;
                if(StringUtils.isNotBlank(svrDesc)){
                    sql += " and ord.service = '"+svrDesc+"' ";
                    sql += " and ord.serve_desc = '"+svrDesc+"' ";
                }
            }
            sql += "order by create_time desc limit "+page*pageSize+","+pageSize;
            sql += " order by create_time desc limit "+page*pageSize+","+pageSize;
            result =   jdbcTemplate.queryForList(sql);
        }
        return result;
@@ -1314,7 +1314,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            result.put("status_-1",0);//已取消
            result.put("status_0",0);//已完成
            result.put("status_1",0);//预警中
            String sql = " select ord.status,count(ord.id) count from base_emergency_assistance_order ord INNER JOIN base_patient_helper ph on ord.patient = ph.patient and ph.del=1 " +
            String sql = " select ord.status,count(distinct ord.id) count from base_emergency_assistance_order ord INNER JOIN base_patient_helper ph on ord.patient = ph.patient and ph.del=1 " +
                    "  where ph.doctor='"+doctor+"'  " ;
            List<Map<String,Object>> sqlResult = jdbcTemplate.queryForList(sql);
            for (Map<String,Object> map:sqlResult){
@@ -1343,7 +1343,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
                result.put("svr_" + server.get("py_code").toString(), 0);
                serverTmp.put(server.get("dict_value").toString(), server.get("py_code").toString());
            }
            sql = "select ord.status,ord.serve_desc,count(ord.id) count from base_security_monitoring_order ord INNER JOIN base_patient p on p.id = ord.patient " +
            sql = "select ord.status,ord.serve_desc,count(distinct ord.id) count from base_security_monitoring_order ord INNER JOIN base_patient p on p.id = ord.patient " +
                    " INNER JOIN base_patient_helper ph on ord.patient = ph.patient and ph.del=1  where ph.doctor='"+doctor+"'  ";
            String fliter = "  ";
            fliter += " group by ord.status,ord.serve_desc ";
@@ -1360,11 +1360,11 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            }
            return result;
        }else {
            String sql = " select count(ord.id)  from base_emergency_assistance_order ord INNER JOIN base_patient_helper ph on ord.patient = ph.patient and ph.del=1 " +
            String sql = " select count(distinct ord.id)  from base_emergency_assistance_order ord INNER JOIN base_patient p on ord.patient = p.id and p.del=1 INNER JOIN base_patient_helper ph on ord.patient = ph.patient and ph.del=1 " +
                    "  where ph.doctor='"+doctor+"' " ;
            Long emeCount = jdbcTemplate.queryForObject(sql,Long.class);
            result.put("emeAll",emeCount);
            sql = "select count(ord.id) count from base_security_monitoring_order ord INNER JOIN base_patient p on ord.patient = ord.patient " +
            sql = "select count(distinct ord.id) count from base_security_monitoring_order ord INNER JOIN base_patient p on ord.patient = p.id and p.del=1 " +
                    " INNER JOIN base_patient_helper ph on p.id = ph.patient and ph.del=1  where ph.doctor='"+doctor+"'  ";
            String fliter = "  ";
            Long secuCount = jdbcTemplate.queryForObject(sql,Long.class);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/doctor/CareDoctorService.java

@@ -15,6 +15,7 @@ import com.yihu.jw.entity.care.doorCoach.BaseDoorCoachOrderDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.im.service.ImService;
import com.yihu.jw.org.dao.BaseOrgDao;
import com.yihu.jw.patient.service.BasePatientService;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
@@ -63,6 +64,8 @@ public class CareDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
    private DeviceService deviceService;
    @Autowired
    private BirthdayWishesService birthdayWishesService;
    @Autowired
    private BasePatientService basePatientService;
    /**
     * 更新在线状态
@@ -181,6 +184,16 @@ public class CareDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
            doctorDO.setPhoto(photo);
            doctorDO.setName(name);
            doctorDO.setSex(sex);
            if (org.apache.commons.lang3.StringUtils.isBlank(doctorDO.getPhoto())){
                String hzPhoto= basePatientService.getHzAvatar(2,doctorDO.getLevel()+"",null,null==doctorDO.getSex()?"":doctorDO.getSex()+"",doctorDO.getIdcard());
                doctorDO.setPhoto(hzPhoto);
                String sql = " select count(id) from wlyy_hospital_sys_dict where dict_name='hz_default_avatar' and dict_value='"+doctorDO.getPhoto()+"' ";
                Integer defaultAvatar =  jdbcTemplate.queryForObject(sql,Integer.class);
                if (defaultAvatar>0){
                    hzPhoto= basePatientService.getHzAvatar(2,doctorDO.getLevel()+"",null,null==doctorDO.getSex()?"":doctorDO.getSex()+"",doctorDO.getIdcard());
                    doctorDO.setPhoto(hzPhoto);
                }
            }
            baseDoctorDao.save(doctorDO);
        }
        return true;
@@ -628,7 +641,7 @@ public class CareDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
                "   base_life_care_order o  " +
                " LEFT JOIN base_patient p ON o.patient = p.id " +
                " WHERE  " +
                "  o.hospital = 'hospital' "+
                "  o.hospital = '"+hospital+"' "+
                " AND o.status = 1 and o.pay_status>0  ";
        Long count = jdbcTemplate.queryForObject(countSql,Long.class);
        if (count>0){

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/family/PatientFamilyMemberService.java

@@ -10,6 +10,7 @@ import com.yihu.jw.entity.base.patient.BasePatientFamilyMemberDO;
import com.yihu.jw.entity.base.servicePackage.ServicePackageSignRecordDO;
import com.yihu.jw.im.util.ImUtil;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.patient.service.BasePatientService;
import com.yihu.jw.restmodel.ResponseContant;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.security.MD5;
@@ -41,7 +42,8 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
    private WeiXinAccessTokenUtils weiXinAccessTokenUtils;
    @Autowired
    private ImUtil imUtil;
    @Autowired
    private BasePatientService basePatientService;
    static {
@@ -209,12 +211,34 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
            if (m.getOpenidTime() == null) {
                m.setOpenidTime(new Date());
            }
            if (org.apache.commons.lang3.StringUtils.isBlank(m.getPhoto())){
                String hzPhoto= basePatientService.getHzAvatar(1,null,m.getArchiveType()+"",null==m.getSex()?"":m.getSex()+"",m.getIdcard());
                m.setPhoto(hzPhoto);
            }else{
                String sql = " select count(id) from wlyy_hospital_sys_dict where dict_name='hz_default_avatar' and dict_value='"+m.getPhoto()+"' ";
                Integer defaultAvatar =  jdbcTemplate.queryForObject(sql,Integer.class);
                if (defaultAvatar>0){
                    String hzPhoto= basePatientService.getHzAvatar(1,null,m.getArchiveType()+"",null==m.getSex()?"":m.getSex()+"",m.getIdcard());
                    m.setPhoto(hzPhoto);
                }
            }
            patientDao.save(m);
        } else if (StringUtils.isBlank(p.getOpenid()) && StringUtils.isNotBlank(m.getOpenid()) && !"undefined".equals(m.getOpenid())) {
            p.setOpenid(m.getOpenid());
            if (p.getOpenidTime() == null) {
                p.setOpenidTime(new Date());
            }
            if (org.apache.commons.lang3.StringUtils.isBlank(p.getPhoto())){
                String hzPhoto= basePatientService.getHzAvatar(1,null,p.getArchiveType()+"",null==p.getSex()?"":p.getSex()+"",p.getIdcard());
                p.setPhoto(hzPhoto);
            }else{
                String sql = " select count(id) from wlyy_hospital_sys_dict where dict_name='hz_default_avatar' and dict_value='"+p.getPhoto()+"' ";
                Integer defaultAvatar =  jdbcTemplate.queryForObject(sql,Integer.class);
                if (defaultAvatar>0){
                    String hzPhoto= basePatientService.getHzAvatar(1,null,p.getArchiveType()+"",null==p.getSex()?"":p.getSex()+"",p.getIdcard());
                    p.setPhoto(hzPhoto);
                }
            }
            patientDao.save(p);
        }
@@ -278,6 +302,17 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
                basePatientDO.setDel("1");
                basePatientDO.setLocked(0);
                basePatientDO.setEnabled(1);
                if (org.apache.commons.lang3.StringUtils.isBlank(basePatientDO.getPhoto())){
                    String hzPhoto= basePatientService.getHzAvatar(1,null,basePatientDO.getArchiveType()+"",null==basePatientDO.getSex()?"":basePatientDO.getSex()+"",basePatientDO.getIdcard());
                    basePatientDO.setPhoto(hzPhoto);
                }else{
                    String sql = " select count(id) from wlyy_hospital_sys_dict where dict_name='hz_default_avatar' and dict_value='"+basePatientDO.getPhoto()+"' ";
                    Integer defaultAvatar =  jdbcTemplate.queryForObject(sql,Integer.class);
                    if (defaultAvatar>0){
                        String hzPhoto= basePatientService.getHzAvatar(1,null,basePatientDO.getArchiveType()+"",null==basePatientDO.getSex()?"":basePatientDO.getSex()+"",basePatientDO.getIdcard());
                        basePatientDO.setPhoto(hzPhoto);
                    }
                }
                patientDao.save(basePatientDO);
                addPatient = basePatientDO;
            }else {

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

@@ -559,7 +559,9 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
                    logger.error(failMsg);
                    return result;
                }
                orderDO.setPayStatus(1);
                orderDO.setPayWay(1);
                orderDO.setPayTime(new Date());
            }
            Integer type = orderDO.getType();
            if (type==1||type==2){

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/message/DoctorMessageService.java

@@ -366,7 +366,7 @@ public class DoctorMessageService {
                    if (doctorHospitalDOs.size()>0){
                        String hospital = doctorHospitalDOs.get(0).getOrgCode();
                        sql =" SELECT count(o.id)   FROM  base_life_care_order o LEFT JOIN base_patient p ON o.patient = p.id  " +
                                "WHERE  o.hospital = '"+hospital+"'  AND (o.`status` = 1 or -100 = 1) and o.pay_status>0 and o.status<>0 ";
                                "WHERE  o.hospital = '"+hospital+"'  AND o.`status` = 1 ";
                        total += jdbcTemplate.queryForObject(sql,Integer.class);
                    }
                }
@@ -402,8 +402,8 @@ public class DoctorMessageService {
                    List<BaseDoctorHospitalDO> doctorHospitalDOs = doctorHospitalDao.findByDoctorCode(doctor);
                    if (doctorHospitalDOs.size()>0){
                        String hospital = doctorHospitalDOs.get(0).getOrgCode();
                        sql =" SELECT count(o.id)   FROM  base_life_care_order o LEFT JOIN base_patient p ON o.patient = p.id  " +
                                "WHERE  o.hospital = '"+hospital+"'  AND (o.`status` = 1 or -100 = 1) and o.pay_status>0 and o.status<>0 ";
                        sql =" SELECT count(o.id)   FROM  base_life_care_order o LEFT JOIN base_patient p ON o.patient = p.id and p.del=1  " +
                                "WHERE  o.hospital = '"+hospital+"'  AND o.`status` = 1 ";
                        total += jdbcTemplate.queryForObject(sql,Integer.class);
                    }
                }
@@ -413,59 +413,47 @@ public class DoctorMessageService {
    }
    //助老员
    public JSONObject getHelperPreventLost(String doctor,String id,String type){
    public JSONObject helperTodoWork(String doctor,String id,String type){
        JSONObject result = new JSONObject();
        boolean typeNull = StringUtils.isBlank(type);
        if (typeNull||type.equals("preventLost")){//安全监护
            String sql ="select id,patient_name,DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%S') create_time,'preventLost' as service_type " +
                    " from base_security_monitoring_order ord where 1=1  " +
                    "and status ='1'   " +
                    "and  EXISTS ( SELECT 1 from base_patient_helper ph inner join base_patient p on ph.patient = p.id and p.del=1 where ord.patient = ph.patient and ph.doctor='"+doctor+"' and ph.del=1 ) " +
                    "order by create_time DESC ";
            if (StringUtils.isNotBlank(id)){
                sql = "select * from base_security_monitoring_order ord where 1=1 \n" +
                        "AND id = '"+id+"'\n" +
                        "and status ='1' \n" +
                        "and  EXISTS (SELECT 1 from base_patient_helper ph inner join base_patient p on ph.patient = p.id and p.del=1 where ord.patient = ph.patient and ph.doctor='"+doctor+"' and ph.del=1) ";
            List<Map<String,Object>> sqlResult = new ArrayList<>();
            if(doctorServicePermissionsService.isPermission(doctor,10)==1){
                String sql ="select id,patient_name,DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%S') create_time,'preventLost' as service_type " +
                        " from base_security_monitoring_order ord where 1=1  " +
                        "and status ='1'   " +
                        "and  EXISTS ( SELECT 1 from base_patient_helper ph inner join base_patient p on ph.patient = p.id and p.del=1 where ord.patient = ph.patient and ph.doctor='"+doctor+"' and ph.del=1 ) " +
                        "order by create_time DESC ";
                        sqlResult  = jdbcTemplate.queryForList(sql);
            }
            List<Map<String,Object>> sqlResult  = jdbcTemplate.queryForList(sql);
            result.put("preventLost",sqlResult);
        }
        if (typeNull||type.equals("emergencyAssistance")){//紧急救助
            String sql ="select id,patient_name,DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%S') create_time,'emergencyAssistance' as service_type from base_emergency_assistance_order ord where 1=1\n" +
                    "and status =1  " +
                    "and EXISTS (  " +
                    "SELECT 1 from base_patient_helper ph inner join base_patient p on ph.patient = p.id and p.del=1 where ord.patient = ph.patient and ph.doctor='"+doctor+"' and ph.del=1 ) " +
                    "order by create_time DESC ";
            if (StringUtils.isNotBlank(id)){
                sql = "select * from base_emergency_assistance_order ord where 1=1 "+
                        " AND id = '"+id+"' and status =1  " +
                        " and EXISTS (SELECT 1 from base_patient_helper ph inner join base_patient p on ph.patient = p.id and p.del=1 where ord.patient = ph.patient and ph.doctor='"+doctor+"' and ph.del=1 ) ";
            List<Map<String,Object>> sqlResult = new ArrayList<>();
            if(doctorServicePermissionsService.isPermission(doctor,8)==1){
                String sql ="select id,patient_name,DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%S') create_time,'emergencyAssistance' as service_type from base_emergency_assistance_order ord where 1=1\n" +
                        "and status =1  " +
                        "and EXISTS (  " +
                        "SELECT 1 from base_patient_helper ph inner join base_patient p on ph.patient = p.id and p.del=1 where ord.patient = ph.patient and ph.doctor='"+doctor+"' and ph.del=1 ) " +
                        "order by create_time DESC ";
                sqlResult  = jdbcTemplate.queryForList(sql);
            }
            List<Map<String,Object>> sqlResult  = jdbcTemplate.queryForList(sql);
            result.put("emergencyAssistance",sqlResult);
        }
        if (typeNull||type.equals("fifeCare")){//生活照料
            String sql ="select id,patient_name,DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%S') create_time,'fifeCare' as service_type from base_life_care_order lco where 1=1 " +
                    "and status =1  " +
                    "and EXISTS (SELECT 1 from base_patient_helper ph inner join base_patient p on ph.patient = p.id and p.del=1 where lco.patient = ph.patient and ph.doctor='"+doctor+"' and ph.del=1  ) " +
                    "order by create_time DESC ";
            if (StringUtils.isNotBlank(id)){
                sql = "select * from base_life_care_order lco where 1=1 " +
                        "AND id = '"+id+"' " +
                        "and status =1  " +
                        "and EXISTS (SELECT 1 from base_patient_helper ph inner join base_patient p on ph.patient = p.id and p.del=1 where lco.patient = ph.patient and ph.doctor='"+doctor+"' and ph.del=1 )";
            List<BaseDoctorHospitalDO> doctorHospitalDOs = doctorHospitalDao.findByDoctorCode(doctor);
            List<Map<String,Object>> sqlResult = new ArrayList<>();
            if(doctorServicePermissionsService.isPermission(doctor,7)==1){
                String sql = "";
                if (doctorHospitalDOs.size()>0) {
                    sql =" SELECT o.id,o.patient_name,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time,'fifeCare' as service_type   FROM  base_life_care_order o LEFT JOIN base_patient p ON o.patient = p.id and p.del=1  " +
                            "WHERE  o.hospital = '"+doctorHospitalDOs.get(0).getOrgCode()+"'  AND o.`status` = 1 ";
                    sqlResult  = jdbcTemplate.queryForList(sql);
                }
            }
            List<Map<String,Object>> sqlResult  = jdbcTemplate.queryForList(sql);
            result.put("fifeCare",sqlResult);
        }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/patient/CarePatientService.java

@@ -22,6 +22,7 @@ import com.yihu.jw.entity.care.sign.CapacityAssessmentRecordDO;
import com.yihu.jw.im.util.ImUtil;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.patient.service.BasePatientMedicardCardService;
import com.yihu.jw.patient.service.BasePatientService;
import com.yihu.jw.restmodel.ResponseContant;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.sms.dao.HospitalSysDictDao;
@@ -83,6 +84,8 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
    private BaseCapacityLabelDao capacityLabelDao;
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private BasePatientService basePatientService;
    /**
     * 获取能力状况
@@ -306,6 +309,17 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
            patientBrief.setMobile(patientDetail.getMobile());
        }
        patientBrief.setMobileRemarks(patientDetail.getMobileRemarks());
        if (org.apache.commons.lang3.StringUtils.isBlank(patientBrief.getPhoto())){
            String hzPhoto= basePatientService.getHzAvatar(1,null,patientBrief.getArchiveType()+"",null==patientBrief.getSex()?"":patientBrief.getSex()+"",patientBrief.getIdcard());
            patientBrief.setPhoto(hzPhoto);
        }else{
            String sql = " select count(id) from wlyy_hospital_sys_dict where dict_name='hz_default_avatar' and dict_value='"+patientBrief.getPhoto()+"' ";
            Integer defaultAvatar =  jdbcTemplate.queryForObject(sql,Integer.class);
            if (defaultAvatar>0){
                String hzPhoto= basePatientService.getHzAvatar(1,null,patientBrief.getArchiveType()+"",null==patientBrief.getSex()?"":patientBrief.getSex()+"",patientBrief.getIdcard());
                patientBrief.setPhoto(hzPhoto);
            }
        }
        patientDao.save(patientBrief);
        JSONObject jsonObject1 = null;
        if (jsonObject.containsKey("signRecordDO")){

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

@@ -11,6 +11,7 @@ import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.care.archive.ArchiveDO;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.patient.dao.BasePatientMedicareCardDao;
import com.yihu.jw.patient.service.BasePatientService;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.mysql.query.BaseJpaService;
@@ -50,6 +51,8 @@ public class ArchiveService extends BaseJpaService<ArchiveDO, ArchiveDao> {
    private ServicePackageService servicePackageService;
    @Autowired
    private DeviceService deviceService;
    @Autowired
    private BasePatientService basePatientService;
    /**
@@ -164,6 +167,17 @@ public class ArchiveService extends BaseJpaService<ArchiveDO, ArchiveDao> {
        patientDO.setCreateTime(new Date());
        patientDO.setUpdateTime(new Date());
        patientDO.setPatientStatus("1");
        if (org.apache.commons.lang3.StringUtils.isBlank(patientDO.getPhoto())){
            String hzPhoto= basePatientService.getHzAvatar(1,null,patientDO.getArchiveType()+"",null==patientDO.getSex()?"":patientDO.getSex()+"",patientDO.getIdcard());
            patientDO.setPhoto(hzPhoto);
        }else{
            String sql = " select count(id) from wlyy_hospital_sys_dict where dict_name='hz_default_avatar' and dict_value='"+patientDO.getPhoto()+"' ";
            Integer defaultAvatar =  jdbcTemplate.queryForObject(sql,Integer.class);
            if (defaultAvatar>0){
                String hzPhoto= basePatientService.getHzAvatar(1,null,patientDO.getArchiveType()+"",null==patientDO.getSex()?"":patientDO.getSex()+"",patientDO.getIdcard());
                patientDO.setPhoto(hzPhoto);
            }
        }
        if(!patientDao.existsByIdcardAndDel(idcard,"1")){
            patientDO = patientDao.save(patientDO);
        }
@@ -222,9 +236,8 @@ public class ArchiveService extends BaseJpaService<ArchiveDO, ArchiveDao> {
        if(StringUtils.isNotBlank(name)){
            filters += " and p.name like '%"+name+"%' ";
        }
        filters+= " GROUP BY p.id ";
        String orderBy = "  ORDER BY ph.create_time DESC " +
        String orderBy = " GROUP BY p.id ORDER BY ph.create_time DESC " +
                "LIMIT "+ (page - 1) * size + "," + size;
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql+filters+orderBy);
@@ -247,7 +260,7 @@ public class ArchiveService extends BaseJpaService<ArchiveDO, ArchiveDao> {
        return PageEnvelop.getSuccessListWithPage("success",list,page,size,count);
    }
    public PageEnvelop<List<Map<String,Object>>> helperArchiveList(String doctorId,String hospital, int page, int size,Integer signStatus,String name){
    public PageEnvelop<List<Map<String,Object>>> helperArchiveList(String doctorId,String hospital, int page, int size,Integer signStatus,String name,String filterMyPatient){
        BaseDoctorDO doctorDO = doctorDao.findById(doctorId);
        if (null==doctorDO){
            return null;
@@ -262,14 +275,16 @@ public class ArchiveService extends BaseJpaService<ArchiveDO, ArchiveDao> {
                    "base_service_package_item i,base_team_member m " +
                    "WHERE  sr.id = r.sign_id and sr.patient = a.patient and sr.status=1 and r.service_package_id = i.service_package_id " +
                    "and i.del = 1 and m.team_code = r.team_code " ;
        if (StringUtils.isNotBlank(hospital)){//
        if (StringUtils.isNotBlank(hospital)){
            filter += " and m.org_code='"+hospital+"'   ";
        }
        if(StringUtils.isNotBlank(name)){
            filter += " and p.name like '%"+name+"%'";
        }
        filter+= " and m.del = '1' and sr.`status`=1 ) ";
        if (StringUtils.isNotBlank(filterMyPatient)){//
            filter += " and p.id not in (select patient from base_patient_helper where doctor='"+doctorId+"' and del=1) ";
        }
        sql= sql+filter+ " group by p.id   "+"LIMIT "+ (page - 1) * size + "," + size ;
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);

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

@@ -853,48 +853,56 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
     */
    public JSONObject helperAddPatient(String patient,String doctor){
        JSONObject result = new JSONObject();
        BasePatientHelperDO patientHelperDO =  patientHelperDao.findByPatientAndDoctor(patient,doctor);
        if (null!=patientHelperDO){
            result.put(ResponseContant.resultFlag,-1);
            result.put(ResponseContant.resultMsg,"居民已存在，无需重复添加");
            return result;
        }
        BasePatientDO patientDO = patientDao.findById(patient);
        if (null==patientDO){
            result.put(ResponseContant.resultFlag,-1);
            result.put(ResponseContant.resultMsg,"添加居民不存在，无法操作");
            return result;
        }
        BaseDoctorDO doctorDO = doctorDao.findById(doctor);
        if (null==doctorDO){
            result.put(ResponseContant.resultFlag,-1);
            result.put(ResponseContant.resultMsg,"助老员不存在，无法操作");
            return result;
        String[] patients = patient.split(",");
        List<BasePatientHelperDO> list = new ArrayList<>();
        for (String tmp:patients){
            BasePatientHelperDO patientHelperDO =  patientHelperDao.findByPatientAndDoctor(tmp,doctor);
            if (null!=patientHelperDO){
                result.put(ResponseContant.resultFlag,-1);
                result.put(ResponseContant.resultMsg,patientHelperDO.getPatientName()+"居民已存在，无需重复添加");
                return result;
            }
            BasePatientDO patientDO = patientDao.findById(tmp);
            if (null==patientDO){
                result.put(ResponseContant.resultFlag,-1);
                result.put(ResponseContant.resultMsg,"添加居民不存在，无法操作");
                return result;
            }
            BaseDoctorDO doctorDO = doctorDao.findById(doctor);
            if (null==doctorDO){
                result.put(ResponseContant.resultFlag,-1);
                result.put(ResponseContant.resultMsg,"助老员不存在，无法操作");
                return result;
            }
            //只有存在签约的居民才可被助老员关联
            String sql = " SELECT count(DISTINCT p.id)  " +
                    "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  " +
                    "WHERE  sr.id = r.sign_id and sr.patient = a.patient and sr.status=1 and r.service_package_id = i.service_package_id  " +
                    "and i.del = 1 and m.team_code = r.team_code " +
                    "and p.id='"+tmp+"' ) ";
            Integer signFlag = jdbcTemplate.queryForObject(sql,Integer.class);
            if (signFlag==0){
                result.put(ResponseContant.resultFlag,-1);
                result.put(ResponseContant.resultMsg,"当前居民未与社工签约，无法添加");
                return result;
            }
            patientHelperDO = new BasePatientHelperDO();
            patientHelperDO.setPatient(tmp);
            patientHelperDO.setPatientName(patientDO.getName());
            patientHelperDO.setDoctor(doctor);
            patientHelperDO.setDoctorName(doctorDO.getName());
            patientHelperDO.setCreateTime(new Date());
            patientHelperDO.setCreateUser(doctor);
            patientHelperDO.setDel("1");
            patientHelperDO.setCreateUserName(doctorDO.getName());
            list.add(patientHelperDO);
        }
        //只有存在签约的居民才可被助老员关联
        String sql = " SELECT count(DISTINCT p.id)  " +
                "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  " +
                "WHERE  sr.id = r.sign_id and sr.patient = a.patient and sr.status=1 and r.service_package_id = i.service_package_id  " +
                "and i.del = 1 and m.team_code = r.team_code " +
                "and p.id='"+patient+"' ) ";
        Integer signFlag = jdbcTemplate.queryForObject(sql,Integer.class);
        if (signFlag==0){
            result.put(ResponseContant.resultFlag,-1);
            result.put(ResponseContant.resultMsg,"当前居民未与社工签约，无法添加");
            return result;
        if (list.size()>0){
            patientHelperDao.save(list);
        }
        patientHelperDO = new BasePatientHelperDO();
        patientHelperDO.setPatient(patient);
        patientHelperDO.setPatientName(patientDO.getName());
        patientHelperDO.setDoctor(doctor);
        patientHelperDO.setDoctorName(doctorDO.getName());
        patientHelperDO.setCreateTime(new Date());
        patientHelperDO.setCreateUser(doctor);
        patientHelperDO.setDel("1");
        patientHelperDO.setCreateUserName(doctorDO.getName());
        patientHelperDao.save(patientHelperDO);
        result.put(ResponseContant.resultFlag,200);
        result.put(ResponseContant.resultMsg,"添加成功");
        return result;
@@ -903,29 +911,37 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
    /**
     * 助老员删除监护老人
     */
    public JSONObject helperDelPatient(String patient,String doctor){
    public JSONObject helperDelPatient(String patient,String doctor) {
        JSONObject result = new JSONObject();
        BasePatientHelperDO patientHelperDO =  patientHelperDao.findByPatientAndDoctor(patient,doctor);
        if (null==patientHelperDO){
            result.put(ResponseContant.resultFlag,-1);
            result.put(ResponseContant.resultMsg,"居民已不在你的列表中");
            return result;
        String[] patients = patient.split(",");
        List<BasePatientHelperDO> list = new ArrayList<>();
        for (String tmp : patients) {
            BasePatientHelperDO patientHelperDO = patientHelperDao.findByPatientAndDoctor(tmp, doctor);
            if (null == patientHelperDO) {
                result.put(ResponseContant.resultFlag, -1);
                result.put(ResponseContant.resultMsg, "居民已不在你的列表中");
                return result;
            }
            BaseDoctorDO doctorDO = doctorDao.findById(doctor);
            if (null == doctorDO) {
                result.put(ResponseContant.resultFlag, -1);
                result.put(ResponseContant.resultMsg, "助老员不存在，无法操作");
                return result;
            }
            patientHelperDO.setDel("0");
            patientHelperDO.setUpdateTime(new Date());
            patientHelperDO.setUpdateUser(doctorDO.getId());
            patientHelperDO.setUpdateUserName(doctorDO.getName());
            list.add(patientHelperDO);
        }
        BaseDoctorDO doctorDO = doctorDao.findById(doctor);
        if (null==doctorDO){
            result.put(ResponseContant.resultFlag,-1);
            result.put(ResponseContant.resultMsg,"助老员不存在，无法操作");
            return result;
        if (list.size() > 0) {
            patientHelperDao.save(list);
        }
        patientHelperDO.setDel("0");
        patientHelperDO.setUpdateTime(new Date());
        patientHelperDO.setUpdateUser(doctorDO.getId());
        patientHelperDO.setUpdateUserName(doctorDO.getName());
        result.put(ResponseContant.resultFlag,200);
        result.put(ResponseContant.resultMsg,"删除成功");
        result.put(ResponseContant.resultFlag, 200);
        result.put(ResponseContant.resultMsg, "删除成功");
        return result;
    }
    }
    /**********************************助老员部分******************************************************/
    /**
     * 根据居民和服务项查找医生

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/visit/BaseVisitService.java

@@ -132,7 +132,7 @@ public class BaseVisitService {
     * @param visitContent
     * @param visitImg
     */
    public void adminAddVisit(String doctorCode,String patientCode,String visitContent,String visitImg) throws Exception{
    public void adminAddVisit(String doctorCode,String patientCode,String visitContent,String visitImg,String deviceMaintenance,String health,String lifeConsult) throws Exception{
        BaseVisitDO visitDO = new BaseVisitDO();
        //获取患者信息
        BasePatientDO patient = patientDao.findById(patientCode);
@@ -153,6 +153,9 @@ public class BaseVisitService {
        visitDO.setVisitDate(new Date());
        visitDO.setStatus("1");
        visitDO.setType("2");
        visitDO.setDeviceMaintenance(deviceMaintenance);
        visitDO.setHealth(health);
        visitDO.setLifeConsult(lifeConsult);
        visitDO.setVisitContent(visitContent);
        visitDO.setVisitImg(visitImg);
        baseVisitDao.save(visitDO);
@@ -198,6 +201,9 @@ public class BaseVisitService {
        re.put("patientName", visitDO.getPatientName());
        re.put("visitImg",visitDO.getVisitImg());
        re.put("visitContent",visitDO.getVisitContent());
        re.put("deviceMaintenance",visitDO.getDeviceMaintenance());
        re.put("health",visitDO.getHealth());
        re.put("lifeConsult",visitDO.getLifeConsult());
        BasePatientDO patient = patientDao.findById(visitDO.getPatient());
        if (patient != null) {