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

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

@@ -20,8 +20,8 @@ public class BaseEmergencyWarnLogDO extends IdEntity {
    public String orderId;
    public String userCode;
    public String userName;
    public Integer userType; //用户类型 1居民 2社工
    public String userTypeName; //用户类型 1居民 2社工
    public Integer userType; //用户类型 0居民 1社区医生，2社工, 3教师,4助老员
    public String userTypeName; //用户类型 0居民 1社区医生，2社工, 3教师,4助老员
    public String content;
    public Date createTime;
    public Integer type; //保存类型（1已知悉，2前往，3 110,4 120，5 小结,6 已取消,7 复核，8 发起im会话 9发起音视频通话 10调阅设备详情页）

server/svr-authentication/src/main/java/com/yihu/jw/security/dao/doctor/BaseDoctorDao.java

@@ -36,4 +36,7 @@ public interface BaseDoctorDao extends PagingAndSortingRepository<BaseDoctorDO,
    @Query("from BaseDoctorDO d where  d.del ='1'")
    List<BaseDoctorDO> findByDel();
    @Query("from BaseDoctorDO d where d.mobile =?1 and d.del ='1'")
    BaseDoctorDO findByMobileOne(String mobile);
}

server/svr-authentication/src/main/java/com/yihu/jw/security/dao/patient/BasePatientDao.java

@@ -34,6 +34,9 @@ public interface BasePatientDao extends PagingAndSortingRepository<BasePatientDO
    @Query("from BasePatientDO where mobile = ?1")
    List<BasePatientDO> findByMobile(String mobile);
    @Query("from BasePatientDO where idcard =?1")
    List<BasePatientDO> findByIdcard(String idcard);
    @Query("from BasePatientDO p where p.mobile = ?1 and p.del=?2")
    List<BasePatientDO> findByMobileAndDel(String mobile, String del);

server/svr-authentication/src/main/java/com/yihu/jw/security/exception/PwdException.java

@@ -0,0 +1,24 @@
package com.yihu.jw.security.exception;
import org.springframework.security.oauth2.common.exceptions.ClientAuthenticationException;
/**
 * Created by wsl on 2022/9/20
 */
public class PwdException extends ClientAuthenticationException {
    public PwdException(String msg, Throwable t) {
        super(msg, t);
    }
    public PwdException(String msg) {
        super(msg);
    }
    @Override
    public String getOAuth2ErrorCode() {
         return "pwd_low  error";
    }
}

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -21,6 +21,7 @@ import com.yihu.jw.security.dao.patient.BasePatientDao;
import com.yihu.jw.security.dao.patient.WechatDao;
import com.yihu.jw.security.dao.patient.WlyyHospitalSysDictDao;
import com.yihu.jw.security.exception.ImgCaptchaException;
import com.yihu.jw.security.exception.PwdException;
import com.yihu.jw.security.login.service.BaseLoginLogService;
import com.yihu.jw.security.model.*;
import com.yihu.jw.security.oauth2.core.redis.WlyyRedisVerifyCodeService;
@@ -182,6 +183,8 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
    private BaseSmsDao baseSmsDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private BaseDoctorDao baseDoctorDao;
    @PostConstruct
    private void init() {
@@ -404,6 +407,14 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
            if (token == null) {
                throw new UnsupportedGrantTypeException("Unsupported grant type: " + tokenRequest.getGrantType());
            }
        boolean past = testPwd(parameters.get("password"));
        if (!"family".equals(flag)) {
            if (!past) {
                throw new PwdException("密码强度低，请用验证码登录，或者修改密码后在从新登录！");
            }
        }
        /*如果是移动端登陆则移除之前的token，
        在网关处通过HTTP状态码告知前端是过期（402）还是账号在别处登陆（403），
        实现同一账号只能在一处登陆*/
@@ -1294,6 +1305,8 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
            return handleOAuth2Exception(new Oauth2Envelop(e.getMessage(), -1), e);
        }else if (e instanceof ImgCaptchaException) {
            return handleOAuth2Exception(new Oauth2Envelop("图片验证码错误", ResultStatus.IMG_CAPTCHA), e);
        }else if (e instanceof PwdException){
            return handleOAuth2Exception(new Oauth2Envelop("密码强度低，请用验证码登录，或者修改密码后在从新登录！", 1301), e);
        }
        return handleOAuth2Exception(new Oauth2Envelop("请求失败", -1), e);
    }
@@ -1981,6 +1994,18 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
    }
    private boolean testPwd(String pwd){
        //3种
        String PW_PATTERN2 = "^(?![A-Za-z0-9]+$)(?![A-Za-z\\W]+$)[a-zA-Z0-9_\\W]{8,}$";
        if(org.apache.commons.lang3.StringUtils.isBlank(pwd)){
            return false;
        }
        if(pwd.length()<8||pwd.length()>20){
            return false;
        }
        return pwd.matches(PW_PATTERN2);
    }
    @RequestMapping(value = "/oauth/getSsoPublicKey", method = RequestMethod.GET)
    @ApiOperation("获取通用公钥")
    public ObjEnvelop getSsoPublicKey(String code,String appId)throws Exception{
@@ -2421,6 +2446,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
        }
    }
    @RequestMapping(value = "/oauth/updateDoctorMoble", method = RequestMethod.POST)
    public Envelop updateDoctorMoble(String id,String mobile,String client_id,String captcha){
        if (wlyyRedisVerifyCodeService.verification(client_id, mobile, captcha)) {
@@ -2437,6 +2463,50 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
    }
    @RequestMapping(value = "/oauth/updDoctorPwd", method = RequestMethod.POST)
    public Envelop updateDoctorPwd(String id, String oldPwd, String newPwd,@RequestParam(value = "type",required = false)String type, HttpSession httpSession) {
        KeyPair keyPair = (KeyPair) httpSession.getAttribute("privateKey");
        oldPwd = com.yihu.jw.security.utils.RSAUtils.decryptBase64(oldPwd, keyPair);
        newPwd = com.yihu.jw.security.utils.RSAUtils.decryptBase64(newPwd, keyPair);
        //居民
        if (org.apache.commons.lang3.StringUtils.isNotBlank(type)){
            List<BasePatientDO> patientSize = new ArrayList<>();
            switch (type){
                case "idcard":
                     patientSize = basePatientDao.findByIdcard(id);
                    break;
                case "mobile":
                     patientSize = basePatientDao.findByMobile(id);
                    break;
            }
            if (patientSize.size()<0){
                return ObjEnvelop.getError("账号不存在!");
            }
            String orgPwMd5 = MD5.md5Hex(oldPwd + "{" + patientSize.get(0).getSalt() + "}");
            if (!orgPwMd5.equals(patientSize.get(0).getPassword())) {
                return ObjEnvelop.getError("密码错误");
            }
            patientSize.get(0).setPassword(MD5.md5Hex(newPwd + "{" + patientSize.get(0).getSalt() + "}"));
            basePatientDao.save(patientSize);
        }else {
            //医生
            BaseDoctorDO doctorDO = baseDoctorDao.findByMobileOne(id);
            if (null == doctorDO) {
                return ObjEnvelop.getError("账号不存在");
            }
            String orgPwMd5 = MD5.md5Hex(oldPwd + "{" + doctorDO.getSalt() + "}");
            if (!orgPwMd5.equals(doctorDO.getPassword())) {
                return ObjEnvelop.getError("密码错误");
            }
            //认证信息设置
            doctorDO.setPassword(MD5.md5Hex(newPwd + "{" + doctorDO.getSalt() + "}"));
            baseDoctorDao.save(doctorDO);
        }
        return ObjEnvelop.getSuccess("修改成功!");
    }
    /**

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

@@ -477,7 +477,7 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
                baseDoctorvo.setLocked(0);
                baseDoctorvo.setChargeType("12");
                baseDoctorvo.setBirthday(IdCardUtil.getBirthdayForIdcard(baseDoctorvo.getIdcard()));
                baseDoctorvo.setPassword(MD5.md5Hex(baseDoctorvo.getIdcard().substring(12, 18) + "{" + baseDoctorvo.getSalt() + "}"));
                baseDoctorvo.setPassword(MD5.md5Hex("a"+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,baseDoctorvo.getLevel()+"",null,null==baseDoctorvo.getSex()?"":baseDoctorvo.getSex()+"",baseDoctorvo.getIdcard());

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/assistance/EmergencyAssistanceEndpoint.java

@@ -472,4 +472,17 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
        }
    }
    @PostMapping(value = "updUserTypeAndUserTypeName")
    @ApiOperation(value = "批量跟新紧急预警工单日志居民信息")
    public Envelop updUserTypeAndUserTypeName(){
        try {
            assistanceService.updUserTypeAndUserTypeName();
            return success("更新成功!");
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("更新失败!");
        }
    }
}

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

@@ -6,6 +6,7 @@ import com.yihu.jw.care.service.common.PermissionService;
import com.yihu.jw.care.service.consult.ConsultTeamService;
import com.yihu.jw.care.service.doctor.CareDoctorService;
import com.yihu.jw.care.service.doctor.DoctorServicePermissionsService;
import com.yihu.jw.care.service.patient.CarePatientService;
import com.yihu.jw.care.service.sign.CapacityAssessmentRecordService;
import com.yihu.jw.care.util.DingdingUtil;
import com.yihu.jw.care.util.EntranceUtil;
@@ -20,10 +21,8 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
@@ -51,6 +50,8 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
    private PermissionService permissionService;
    @Autowired
    private DingdingUtil dingdingUtil;
    @Autowired
    private CarePatientService patientService;
    @GetMapping(value = "dingtalk_app_user")
    @ApiOperation(value = "钉钉授权code获取用户信息")
@@ -434,4 +435,18 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
            return failedObjEnvelopException2(e);
        }
    }
    @GetMapping(value = "getPatientById")
    @ApiOperation(value = "获取居民信息")
    public Envelop getPatientById(
            @ApiParam(name = "id", value = "居民id")
            @RequestParam(value = "id", required = true) String id,
            @ApiParam(name = "isCapacity", value = "是否返回能力评估，1返回其他值不返回，默认不返回", required = false)
            @RequestParam(value = "isCapacity", required = false) String isCapacity) {
        try{
            return success("获取成功",patientService.findPatientById(id,null,isCapacity,1));
        }catch (Exception e){
            return failedException2(e);
        }
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/patient/PatientEndpoint.java

@@ -19,7 +19,6 @@ import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -125,7 +124,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "isCapacity", required = false) String isCapacity) {
        try{
            String agent = getAgentUID();
            return success("获取成功",patientService.findPatientById(id,agent,isCapacity));
            return success("获取成功",patientService.findPatientById(id,agent,isCapacity,0));
        }catch (Exception e){
            return failedException2(e);
        }

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

@@ -939,7 +939,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        logTypeDO.setUserCode(patient);
        logTypeDO.setUserName(assistanceDO.getPatientName());
        logTypeDO.setOrderId(orderId);
        logTypeDO.setUserType(1);
        logTypeDO.setUserType(0);
        logTypeDO.setCreateTime(new Date());
        logTypeDO.setContent("已取消");
        logTypeDO.setType(6);
@@ -986,7 +986,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            logTypeDOOne.setUserCode(doctor);
            logTypeDOOne.setUserName(doctorDO.getName());
            logTypeDOOne.setOrderId(orderId);
            logTypeDOOne.setUserType(2);
            logTypeDOOne.setUserType(doctorDO.getLevel());
            logTypeDOOne.setCreateTime(new Date());
            logTypeDOOne.setContent("已知悉");
            logTypeDOOne.setType(1);
@@ -997,7 +997,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        logTypeDO.setUserCode(doctor);
        logTypeDO.setUserName(doctorDO.getName());
        logTypeDO.setOrderId(orderId);
        logTypeDO.setUserType(2);
        logTypeDO.setUserType(doctorDO.getLevel());
        //logTypeDO.setCreateTime(DateUtil.strToDateLong(String.valueOf(new Date().getTime() + 1000)));
        logTypeDO.setCreateTime(new Date());
        logTypeDO.setContent("完成服务小结");
@@ -1156,7 +1156,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
                    logDO.setUserCode(doctor);
                    logDO.setUserName(doctorDO.getName());
                    logDO.setOrderId(orderId);
                    logDO.setUserType(2);
                    logDO.setUserType(doctorDO.getLevel());
                    logDO.setCreateTime(new Date());
                    logDO.setContent("发起im会话");
                    logDO.setType(type);
@@ -1169,7 +1169,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
                    logDO.setUserCode(doctor);
                    logDO.setUserName(doctorDO.getName());
                    logDO.setOrderId(orderId);
                    logDO.setUserType(2);
                    logDO.setUserType(doctorDO.getLevel());
                    logDO.setCreateTime(new Date());
                    logDO.setContent(content);
                    logDO.setType(type);
@@ -1214,7 +1214,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            logDO.setUserCode(doctor);
            logDO.setUserName(doctorDO.getName());
            logDO.setOrderId(orderId);
            logDO.setUserType(2);
            logDO.setUserType(doctorDO.getLevel());
            logDO.setCreateTime(new Date());
            logDO.setContent(content);
            logDO.setType(7);
@@ -1257,7 +1257,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
                logDO.setUserCode(doctor);
                logDO.setUserName(doctorDO.getName());
                logDO.setOrderId(orderId);
                logDO.setUserType(2);
                logDO.setUserType(doctorDO.getLevel());
                logDO.setCreateTime(new Date());
                logDO.setContent("前往定位");
                logDao.save(logDO);
@@ -1268,7 +1268,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
                    logTypeDOOne.setUserCode(doctor);
                    logTypeDOOne.setUserName(doctorDO.getName());
                    logTypeDOOne.setOrderId(orderId);
                    logTypeDOOne.setUserType(2);
                    logTypeDOOne.setUserType(doctorDO.getLevel());
                    logTypeDOOne.setCreateTime(new Date());
                    logTypeDOOne.setContent("已知悉");
                    logTypeDOOne.setType(1);
@@ -1278,7 +1278,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
                logTypeDO.setUserCode(doctor);
                logTypeDO.setUserName(doctorDO.getName());
                logTypeDO.setOrderId(orderId);
                logTypeDO.setUserType(2);
                logTypeDO.setUserType(doctorDO.getLevel());
                logTypeDO.setCreateTime(new Date());
                logTypeDO.setContent("前往定位");
                logTypeDO.setType(2);
@@ -1451,7 +1451,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            if (StringUtils.isNotBlank(logDO.getOrderId())){
                logDO.setUserCode(doctor);
                logDO.setUserName(doctorDO.getName());
                logDO.setUserType(2);
                logDO.setUserType(doctorDO.getLevel());
                logDO.setContent("发送消息\""+message+"\"");
                logDO.setCreateTime(new Date());
                logDao.save(logDO);
@@ -1670,10 +1670,10 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        }
        if(check.size()>0){
            check.forEach(logDO->{
                if(logDO.getUserType()==1){
                if(logDO.getUserType()==0){
                    logDO.setUserTypeName("居民");
                }else{
                    logDO.setUserTypeName("社工");
                    logDO.setUserTypeName(updUserTypeName(logDO.getUserType()));
                }
            });
            check = check.stream().sorted(Comparator.comparing(BaseEmergencyWarnLogDO::getCreateTime)).collect(Collectors.toList());
@@ -1693,10 +1693,10 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        }
        if(dealWith.size()>0){
            dealWith.forEach(logDO->{
                if(logDO.getUserType()==1){
                if(logDO.getUserType()==0){
                    logDO.setUserTypeName("居民");
                }else{
                    logDO.setUserTypeName("社工");
                    logDO.setUserTypeName(updUserTypeName(logDO.getUserType()));
                }
            });
            dealWith = dealWith.stream().sorted(Comparator.comparing(BaseEmergencyWarnLogDO::getCreateTime)).collect(Collectors.toList());
@@ -1707,10 +1707,10 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        List<BaseEmergencyWarnLogDO> conclusion = resultMap.get(5);
        if(conclusion!=null){
            BaseEmergencyWarnLogDO logDO = conclusion.get(0);
            if(logDO.getUserType()==1){
            if(logDO.getUserType()==0){
                logDO.setUserTypeName("居民");
            }else{
                logDO.setUserTypeName("社工");
                logDO.setUserTypeName(updUserTypeName(logDO.getUserType()));
            }
            jsonObject.put("conclusion",logDO);
        }
@@ -1719,10 +1719,10 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        List<BaseEmergencyWarnLogDO> review = resultMap.get(7);
        if(review!=null){
            BaseEmergencyWarnLogDO logDO = review.get(0);
            if(logDO.getUserType()==1){
            if(logDO.getUserType()==0){
                logDO.setUserTypeName("居民");
            }else{
                logDO.setUserTypeName("社工");
                logDO.setUserTypeName(updUserTypeName(logDO.getUserType()));
            }
            jsonObject.put("review",logDO);
        }
@@ -1731,10 +1731,10 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        List<BaseEmergencyWarnLogDO> cancel = resultMap.get(6);
        if(cancel!=null){
            BaseEmergencyWarnLogDO logDO = cancel.get(0);
            if(logDO.getUserType()==1){
            if(logDO.getUserType()==0){
                logDO.setUserTypeName("居民");
            }else{
                logDO.setUserTypeName("社工");
                logDO.setUserTypeName(updUserTypeName(logDO.getUserType()));
            }
            jsonObject.put("cancel",logDO);
        }
@@ -1742,6 +1742,22 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        return jsonObject;
    }
    private String updUserTypeName(Integer type) {
        switch (type) {
            case 1:
                return "社区医生";
            case 2:
                return "社工";
            case 3:
                return "教师";
            case 4:
                return "助老员";
            default:
                return "社工";
        }
    }
    public JSONObject getEmergencyAssistanceProcessOld(String orderId,String orderType){
@@ -1849,6 +1865,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
    }
    public int phoneLogSave(BaseEmergencyWarnLogDO baseEmergencyWarnLogDO,Integer type){
        BaseDoctorDO doctorDO = doctorDao.findById(baseEmergencyWarnLogDO.getUserCode());
        switch (type) {
            case 1:
                baseEmergencyWarnLogDO.setContent("呼叫110");
@@ -1861,7 +1878,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            default:
                return -1;
        }
        baseEmergencyWarnLogDO.setUserType(2);
        baseEmergencyWarnLogDO.setUserType(doctorDO!=null?doctorDO.getLevel():2);
        baseEmergencyWarnLogDO.setCreateTime(new Date());
        logDao.save(baseEmergencyWarnLogDO);
        return 1;
@@ -2151,4 +2168,28 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        return list;
    }
    @Transactional(rollbackFor = Exception.class)
    public void updUserTypeAndUserTypeName(){
        String sql = "select * from base_emergency_warn_log";
        List<BaseEmergencyWarnLogDO> logDOList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(BaseEmergencyWarnLogDO.class));
        List<BaseEmergencyWarnLogDO> result = new ArrayList<>();
        logDOList.stream().forEach(logDO -> {
            if (logDO.getUserType() == 1) {
                logDO.setUserType(0);
            } else {
                BaseDoctorDO doctor = doctorDao.findById(logDO.getUserCode());
                if (doctor!=null) {
                    logDO.setUserType(doctor.getLevel());
                }else {
                    logDO.setUserType(2);
                }
            }
            result.add(logDO);
        });
        logDao.save(result);
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/PatientDeviceService.java

@@ -1194,7 +1194,7 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
                    logDO.setUserCode(doctor);
                    logDO.setUserName(doctorDO.getName());
                    logDO.setOrderId(orderId);
                    logDO.setUserType(2);
                    logDO.setUserType(doctorDO.getLevel());
                    logDO.setCreateTime(new Date());
                    logDO.setContent(content);
                    logDO.setType(10);

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

@@ -10,7 +10,6 @@ import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.doctor.dao.DoctorSpecialDiseaseDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.care.doorCoach.BaseDoorCoachOrderDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.im.service.ImService;
@@ -18,7 +17,6 @@ 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;
import com.yihu.jw.utils.StringUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
@@ -29,7 +27,10 @@ import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * Created by yeshijie on 2021/3/3.
@@ -137,7 +138,7 @@ public class CareDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
     * @return
     */
    public Map<String,Object> doctorInfo(String doctorId,String isRole){
        String sql = "SELECT d.id,d.name,d.doctor_level level,d.photo,d.introduce,d.expertise,d.mobile,d.idcard,d.sex,h.dept_code deptCode,h.dept_name deptName,d.job_title_code jobTitleCode,d.job_title_name jobTitleName ";
        String sql = "SELECT d.id,d.name,d.doctor_level level,d.photo,d.introduce,d.expertise,CONCAT(left(d.mobile,3),'*****',right(d.mobile,3)) mobile,CONCAT(LEFT ( d.idcard, 5 ),'**********',RIGHT ( d.idcard, 3 )) idcard,d.sex,h.dept_code deptCode,h.dept_name deptName,d.job_title_code jobTitleCode,d.job_title_name jobTitleName ";
        sql += " ,h.org_code orgCode,org.address orgAddress,org.name orgName from base_doctor d left join base_doctor_hospital h on d.id = h.doctor_code  and h.del = 1" +
                " LEFT JOIN base_org org on h.org_code = org.`code`  WHERE d.id = '"+doctorId+"' limit 1 ";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
@@ -162,7 +163,7 @@ public class CareDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
     * @return
     */
    public PageEnvelop<List<Map<String,Object>>> doctorPage(String name,String orgCode,int page, int size){
        String sql = "SELECT d.id,d.name,d.photo,d.doctor_level level,d.mobile,d.idcard,d.sex,h.dept_code deptCode,h.dept_name deptName,d.job_title_code jobTitleCode,d.job_title_name jobTitleName ";
        String sql = "SELECT d.id,d.name,d.photo,d.doctor_level level,CONCAT(left(d.mobile,3),'*****',right(d.mobile,3)) mobile,CONCAT(LEFT ( d.idcard, 5 ),'**********',RIGHT ( d.idcard, 3 )) idcard,d.sex,h.dept_code deptCode,h.dept_name deptName,d.job_title_code jobTitleCode,d.job_title_name jobTitleName ";
        String countSql = "SELECT count(d.id) ";
        String filters = "from base_doctor d,base_doctor_hospital h " +

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

@@ -175,7 +175,7 @@ public class PatientMessageService {
                logDO.setUserCode(patientDO.getId());
                logDO.setUserName(patientDO.getName());
                logDO.setOrderId(messageDO.getRelationCode());
                logDO.setUserType(1);
                logDO.setUserType(0);
                logDO.setCreateTime(new Date());
                logDO.setContent("已知悉");
                logDao.save(logDO);

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

@@ -431,31 +431,39 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
     * @param patientId 查看居民id
     * @return
     */
    public JSONObject findPatientById(String patientId,String agent,String isCapacity) throws Exception{
    public JSONObject findPatientById(String patientId,String agent,String isCapacity,Integer type) throws Exception{
        JSONObject res = new JSONObject();
        BasePatientDO patientDO = patientDao.findById(patientId);
        if(StringUtils.isNotBlank(agent)||(patientDO.getArchiveType()!=null&&patientDO.getArchiveType()==3)){
            if (StringUtils.isNotBlank(agent)){
                patientDO = patientDao.findById(agent);
            }
            //老人亲属
            String sql = "SELECT p.* from base_patient p, base_patient_family_member m " +
                    "WHERE p.id = m.family_member  and m.patient = '"+patientDO.getId()+"' and p.del = '1' " ;
            if(StringUtils.isNotBlank(agent)&&!patientId.equals(agent)){
                sql+=" and p.id='"+patientId+"' ";
            }
            sql+= " ORDER BY p.login_date desc ";
            List<BasePatientDO> patientDOs = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(BasePatientDO.class));
            if (patientDOs.size()>0){
                res.put("agentPatient",patientDO);
                patientDO = patientDOs.get(0);
                patientId = patientDO.getId();
            }else {
                res.put("agentPatient",null);
        if (type == 1) {
            res.put("agentPatient", patientDO);
            patientId = patientDO.getId();
        } else {
            if (StringUtils.isNotBlank(agent) || (patientDO.getArchiveType() != null && patientDO.getArchiveType() == 3)) {
                if (StringUtils.isNotBlank(agent)) {
                    patientDO = patientDao.findById(agent);
                }
                //老人亲属
                String sql = "SELECT p.* from base_patient p, base_patient_family_member m " +
                        "WHERE p.id = m.family_member  and m.patient = '" + patientDO.getId() + "' and p.del = '1' ";
                if (StringUtils.isNotBlank(agent) && !patientId.equals(agent)) {
                    sql += " and p.id='" + patientId + "' ";
                }
                sql += " ORDER BY p.login_date desc ";
                List<BasePatientDO> patientDOs = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(BasePatientDO.class));
                if (patientDOs.size() > 0) {
                    res.put("agentPatient", patientDO);
                    patientDO = patientDOs.get(0);
                    patientId = patientDO.getId();
                } else {
                    res.put("agentPatient", null);
                }
            } else {
                res.put("agentPatient", null);
            }
        }else{
            res.put("agentPatient",null);
        }
        patientDO = patientDao.findById(patientId);
        if (patientDO.getArchiveStatus()!=null){
            patientDO.setArchiveStatusName(dictService.fingByNameAndCode(ConstantUtil.DICT_ARCHIVESTATUS,String.valueOf(patientDO.getArchiveStatus())));

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

@@ -1409,7 +1409,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
            logTypeDOOne.setUserCode(doctor);
            logTypeDOOne.setUserName(doctorVO.getName());
            logTypeDOOne.setOrderId(orderId);
            logTypeDOOne.setUserType(2);
            logTypeDOOne.setUserType(doctorVO.getLevel());
            logTypeDOOne.setCreateTime(new Date());
            logTypeDOOne.setContent("已知悉");
            logTypeDOOne.setType(1);
@@ -1420,7 +1420,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        logTypeDO.setUserCode(doctor);
        logTypeDO.setUserName(one.getDoctorName());
        logTypeDO.setOrderId(orderId);
        logTypeDO.setUserType(2);
        logTypeDO.setUserType(doctorVO.getLevel());
        //logTypeDO.setCreateTime(DateUtil.strToDateLong(String.valueOf(new Date().getTime() + 1000)));
        logTypeDO.setCreateTime(new Date());
        logTypeDO.setContent("完成服务小结");
@@ -2479,7 +2479,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                logDO.setUserCode(doctor);
                logDO.setUserName(doctorDO.getName());
                logDO.setOrderId(orderId);
                logDO.setUserType(2);
                logDO.setUserType(doctorDO.getLevel());
                logDO.setCreateTime(new Date());
                logDO.setContent("社工" + doctorDO.getName() + "前往定位");
                logDao.save(logDO);
@@ -2487,7 +2487,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                logTypeDO.setUserCode(doctor);
                logTypeDO.setUserName(doctorDO.getName());
                logTypeDO.setOrderId(orderId);
                logTypeDO.setUserType(2);
                logTypeDO.setUserType(doctorDO.getLevel());
                logTypeDO.setCreateTime(new Date());
                logTypeDO.setContent("前往定位");
                logTypeDO.setType(2);
@@ -2511,14 +2511,14 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
            logDO.setUserCode(doctor);
            logDO.setUserName(doctorDO.getName());
            logDO.setOrderId(orderId);
            logDO.setUserType(2);
            logDO.setUserType(doctorDO.getLevel());
            logDO.setCreateTime(new Date());
            logDO.setContent("已知悉");
            logTypeDD.setUserCode(doctor);
            logTypeDD.setUserName(doctorDO.getName());
            logTypeDD.setOrderId(orderId);
            logTypeDD.setUserType(2);
            logTypeDD.setUserType(doctorDO.getLevel());
            logTypeDD.setCreateTime(new Date());
            logTypeDD.setContent("已知悉");
            logTypeDD.setType(1);

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

@@ -622,7 +622,7 @@ public class CapacityAssessmentRecordService extends BaseJpaService<CapacityAsse
        String sql = " SELECT COUNT(DISTINCT A.patient) count,A.level_conclusion \n" +
                " from ( select ar.patient,ar.label_code as level_conclusion from  wlyy_patient_label ar, " +
                "  base_patient_helper ph where  ar.patient = ph.patient and  ph.doctor='"+doctorId+"' and ph.del=1  " +
                "  base_patient_helper ph where  ar.patient = ph.patient and  ph.doctor='"+doctorId+"' and ph.del=1 and label_type = 1 " +
                " GROUP BY ar.patient ORDER BY ar.czrq desc)A " +
                " GROUP BY a.level_conclusion " ;
        List<Map<String,Object>> countMapList = jdbcTemplate.queryForList(sql);