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

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

@@ -2,6 +2,7 @@ package com.yihu.jw.entity.base.servicePackage;
import com.yihu.jw.entity.UuidIdentityEntityWithCreateTime;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
@@ -26,6 +27,7 @@ public class ServicePackageRecordDO extends UuidIdentityEntityWithCreateTime imp
     * 居民id
     */
    private String patient;
    private String teamCode;//服务团队id
    public String getSignId() {
        return signId;
@@ -50,4 +52,13 @@ public class ServicePackageRecordDO extends UuidIdentityEntityWithCreateTime imp
    public void setPatient(String patient) {
        this.patient = patient;
    }
    @Column(name = "team_code")
    public String getTeamCode() {
        return teamCode;
    }
    public void setTeamCode(String teamCode) {
        this.teamCode = teamCode;
    }
}

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

@@ -27,7 +27,6 @@ public class ServicePackageSignRecordDO extends UuidIdentityEntityWithCreateTime
    private Date startTime;//服务开始时间
    private Date endTime;//服务结束时间
    private Integer status;//状态 0新增，1生效，-1已过期
    private String teamCode;//服务团队id
    /**
     * 签约的服务包
@@ -139,12 +138,4 @@ public class ServicePackageSignRecordDO extends UuidIdentityEntityWithCreateTime
        this.packageList = packageList;
    }
    @Column(name = "team_code")
    public String getTeamCode() {
        return teamCode;
    }
    public void setTeamCode(String teamCode) {
        this.teamCode = teamCode;
    }
}

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

@@ -41,7 +41,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = "testException")
    @ApiOperation(value = "测试异常")
    public String testException2(String type) throws Exception {
//        patientService.intiPatient();
        if("1".equals(type)){
            throw new NullPointerException();
        }else if("2".equals(type)){

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

@@ -568,4 +568,21 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
        }
        return jdbcTemplate.queryForObject(sql,Integer.class);
    }
    public void intiPatient(){
        String sql = "SELECT * from base_patient WHERE residential_area is not null and `password` is null";
        List<BasePatientDO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(BasePatientDO.class));
        for (BasePatientDO patient:list){
            patient.setEnabled(1);
            patient.setLocked(0);
            String salt = UUID.randomUUID().toString().substring(0,5);
            String idcard = patient.getIdcard();
            String  pw = idcard.substring(idcard.length()-6);
            patient.setPassword(MD5.md5Hex(pw + "{" + salt + "}"));
            patient.setSalt(salt);
        }
        patientDao.save(list);
    }
}

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

@@ -124,7 +124,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
                "WHERE " +
                " sr.id = r.sign_id and sr.status=1 and sr.patient = '"+patient+"'" +
                " AND r.service_package_id = i.id " +
                "AND i.del = 1 and m.team_code = sr.team_code and m.doctor_code = d.id " +
                "AND i.del = 1  and m.team_code = r.team_code and sr.id=r.sign_id and m.doctor_code = d.id " +
                "               and m.del = '1'";
        if(StringUtils.isNoneBlank(orgCode)){
            sql += " and i.org_code = '"+orgCode+"' " ;
@@ -140,7 +140,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
     * @return
     */
    public List<Map<String,Object>> fingServiceItemsByPatientId(String patientId){
        String sql = "SELECT DISTINCT i.code,i.name,i.team_code from base_service_package_sign_record sr,base_service_package_record r, " +
        String sql = "SELECT DISTINCT i.code,i.name,r.team_code from base_service_package_sign_record sr,base_service_package_record r, " +
                " base_service_package_item i  where  sr.id = r.sign_id and sr.status=1 and r.service_package_id = i.service_package_id " +
                "  and i.del = 1 and sr.`status`=1 and  sr.patient  = '"+patientId+"' ";
        return jdbcTemplate.queryForList(sql);
@@ -182,8 +182,8 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
     * @param signId
     */
    public List<Map<String,Object>> fingdDoctorBySignId(String signId,Integer level){
        String sql = "SELECT DISTINCT d.id,d.name from base_service_package_sign_record sr,base_team_member m,base_doctor d " +
                "WHERE sr.status=1 and m.team_code = sr.team_code and m.doctor_code = d.id " +
        String sql = "SELECT DISTINCT d.id,d.name from base_service_package_sign_record sr,base_service_package_record r,base_team_member m,base_doctor d " +
                "WHERE sr.status=1 and m.team_code = r.team_code and sr.id=r.sign_id and m.doctor_code = d.id " +
                "and m.del = '1' and d.doctor_level = " + level+
                " and sr.id = '"+signId+"' ";
        return jdbcTemplate.queryForList(sql);
@@ -194,8 +194,8 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
     * @param patientId
     */
    public List<Map<String,Object>> fingdDoctorByPaitenId(String patientId){
        String sql = "SELECT DISTINCT d.id,d.name from base_service_package_sign_record sr,base_team_member m,base_doctor d  " +
                "               WHERE sr.status=1  m.team_code = sr.team_code and m.doctor_code = d.id " +
        String sql = "SELECT DISTINCT d.id,d.name from base_service_package_sign_record sr,base_service_package_record r,base_team_member m,base_doctor d  " +
                "               WHERE sr.status=1 and m.team_code = r.team_code and sr.id=r.sign_id and m.doctor_code = d.id " +
                "               and m.del = '1' and sr.patient = '"+patientId+"' " ;
        return jdbcTemplate.queryForList(sql);
    }
@@ -225,8 +225,8 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
        String sql = "SELECT DISTINCT sr.patient,sr.id,sr.start_time,p.name,p.sex,p.idcard,p.openid,p.photo ";
        String countSql = "SELECT count(DISTINCT sr.patient) ";
        String filters = " from base_service_package_sign_record sr,base_team_member m,base_patient p " +
                "WHERE  sr.status=1 and m.team_code = sr.team_code and p.id = sr.patient " +
        String filters = " from base_service_package_sign_record sr,base_service_package_record r,base_team_member m,base_patient p " +
                "WHERE  sr.status=1 and m.team_code = r.team_code and sr.id=r.sign_id and p.id = sr.patient " +
                "and m.doctor_code = '"+doctorId+"' and m.del = '1'  ";
        if(!StringUtil.isEmpty(name)){
@@ -255,8 +255,8 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
     * @return
     */
    public int getSignTotal(String doctorId){
        String sql = "SELECT COUNT(DISTINCT sr.patient) from base_service_package_sign_record sr,base_team_member m " +
                "WHERE sr.status=1 and m.team_code = sr.team_code " +
        String sql = "SELECT COUNT(DISTINCT sr.patient) from base_service_package_sign_record sr,base_service_package_record r,base_team_member m " +
                "WHERE sr.status=1 and m.team_code = r.team_code and sr.id=r.sign_id" +
                "and m.doctor_code = '"+doctorId+"' and m.del = '1' ";
        return jdbcTemplate.queryForObject(sql,Integer.class);
@@ -484,9 +484,9 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
    public List<Map<String,Object>> getServerDoctorAll(String patient,String onlineFlag){
        String sql="select DISTINCT doc.id doctor,CONCAT(doc.`name`,CASE WHEN doc.doctor_level=1 THEN '(社区医生)' ELSE '(助老员)' END) as name,doc.photo,doc.mobile,0 as onLineFlag " +
                "from base_service_package_sign_record spsr,base_team_member mem,base_doctor doc " +
                "from base_service_package_sign_record spsr,base_service_package_record r,base_team_member mem,base_doctor doc " +
                "WHERE spsr.patient = '"+patient+"' AND spsr.status = 1  " +
                "and spsr.team_code = mem.team_code and mem.doctor_code = doc.id and mem.del=1 ";
                "and r.team_code = mem.team_code and spsr.id=r.sign_id and mem.doctor_code = doc.id and mem.del=1 ";
        List<Map<String,Object>>result = jdbcTemplate.queryForList(sql);
        if ("1".equals(onlineFlag)){//展示是否在线
            String listStr = imUtil.getOnlineListByType("helper");
@@ -546,7 +546,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
     * @param patient
     */
    public List<Map<String,Object>> findPatientSignList(String patient){
        String sql = "SELECT r.id,sr.team_code teamCode,sr.id signId, DATE_FORMAT(sr.create_time,'%Y-%m-%d %H:%i:%S') createTime, " +
        String sql = "SELECT r.id,r.team_code teamCode,sr.id signId, DATE_FORMAT(sr.create_time,'%Y-%m-%d %H:%i:%S') createTime, " +
                " DATE_FORMAT(sr.start_time,'%Y-%m-%d %H:%i:%S')  startTime, " +
                " DATE_FORMAT(sr.end_time,'%Y-%m-%d %H:%i:%S') endTime,p.name,sr.`status`,p.org_code orgCode,p.org_name orgName " +
                "FROM " +
@@ -588,10 +588,10 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
                "AND r.id = '"+id+"' ";
        String doctorSql = "SELECT d.* from base_team_member t,base_doctor d,base_service_package_record r,base_service_package_sign_record sr" +
                " WHERE r.id = '"+id+"' and r.sign_id=sr.id and t.team_code = sr.team_code and t.doctor_code = d.id and d.del = 1 and t.del =1";
                " WHERE r.id = '"+id+"' and r.sign_id=sr.id and t.team_code = r.team_code and t.doctor_code = d.id and d.del = 1 and t.del =1";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(orgSql);
        Map<String,Object> result = list.get(0);
        List<BaseDoctorDO> doctorDOList = jdbcTemplate.query(doctorSql, new BeanPropertyRowMapper<>(BaseDoctorDO.class));
        List<BaseDoctorDO> doctorDOList = jdbcTemplate.query(doctorSql, new BeanPropertyRowMapper(BaseDoctorDO.class));
        result.put("doctorDOList",doctorDOList);
        return result;
    }
@@ -603,7 +603,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
        String sql = "SELECT d.id,d.name,d.photo,r.id detailId,h.org_code orgCode,h.org_name orgName,d.job_title_code jobTitleCode,d.job_title_name jobTitleName" +
                " from base_team_member t,base_doctor d,base_service_package_record r,base_service_package_sign_record sr" +
                ",base_doctor_hospital h" +
                " WHERE sr.patient = '"+pateint+"'and sr.status=1  and r.sign_id=sr.id and t.team_code = sr.team_code " +
                " WHERE sr.patient = '"+pateint+"'and sr.status=1  and r.sign_id=sr.id and t.team_code = r.team_code " +
                " and t.doctor_code = d.id and d.del = 1 and t.del =1 and h.doctor_code = d.id and h.del=1";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        return list;