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

common/common-entity/src/main/java/com/yihu/jw/entity/util/TransforSqlUtl.java

@@ -8,7 +8,7 @@ package com.yihu.jw.entity.util;
 */
public class TransforSqlUtl {
    private static final boolean dbEncrypt=false; //不需要加密时 改为false即可，实体类注释需同时处理
    private static final boolean dbEncrypt=true; //不需要加密时 改为false即可，实体类注释需同时处理
    public static String wlyySpecialistPatientRelationLike(String sql,String ...replaceName){
        for (String tmp :replaceName){

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

@@ -422,9 +422,10 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        List<Map<String,Object>> securityDevices = patientDeviceService.patientEmeDeviceList(assistanceDO.getPatient());
        emergencyOrderVO.setSecurityDevices(securityDevices);
        if(StringUtils.isNotBlank(patientDO.getIdcard())){
            emergencyOrderVO.setAge((IdCardUtil.getAgeForIdcard(patientDO.getIdcard()))+"");
        }
        //if(StringUtils.isNotBlank(patientDO.getIdcard())){
            //emergencyOrderVO.setAge((IdCardUtil.getAgeForIdcard(patientDO.getIdcard()))+"");
        //}
        emergencyOrderVO.setAge(DateUtil.getAgeByBirthday(patientDO.getBirthday())+"");
        emergencyOrderVO.setLiveAddress(patientDO.getAddress());
        emergencyOrderVO.setOrderSource(assistanceDO.getOrderSource());
        if(assistanceDO.getStatus()==-2){//误报警

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

@@ -412,9 +412,10 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        emergencyOrderVO.setSecurityDevices(securityDevices);
        if (StringUtils.isNotBlank(patientDO.getIdcard())) {
            emergencyOrderVO.setAge((IdCardUtil.getAgeForIdcard(patientDO.getIdcard())) + "");
        }
        //if (StringUtils.isNotBlank(patientDO.getIdcard())) {
        //    emergencyOrderVO.setAge((IdCardUtil.getAgeForIdcard(patientDO.getIdcard())) + "");
        //}
        emergencyOrderVO.setAge(DateUtil.getAgeByBirthday(patientDO.getBirthday())+"");
        emergencyOrderVO.setLiveAddress(patientDO.getAddress());
        emergencyOrderVO.setOrderSource(orderDO.getOrderSource());
        if (orderDO.getStatus() == -2) {//误报警

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/statistics/StatisticsService.java

@@ -3523,7 +3523,7 @@ public class StatisticsService {
            statusSql = " AND o.status = "+status+"";
        }
        String sql = "SELECT p.name,o.`status`,o.id AS orderId,DATE_FORMAT( o.create_time, '%Y-%m-%d %H:%i:%s' ) AS create_time, " +
        String sql = "SELECT p.name,o.`status`,o.id AS orderId,DATE_FORMAT( o.create_time, '%Y-%m-%d %H:%i:%s' ) AS create_time,p.id patientId, " +
                " GROUP_CONCAT( DISTINCT d.NAME SEPARATOR ',' ) AS doctorName, " +
                " GROUP_CONCAT( DISTINCT d.mobile SEPARATOR ',' ) AS dmobile, " +
                " p.mobile AS pmobile, p.address AS address,t.`name` AS orgName, " +
@@ -3542,7 +3542,7 @@ public class StatisticsService {
                 statusSql+nameSql+idcardSql+orgCodeSql+
                " AND o.org_code NOT IN ( SELECT DISTINCT dict_code FROM wlyy_hospital_sys_dict WHERE dict_name = 'jkzl_org' AND dict_code IS NOT NULL )  GROUP BY o.id " +
                " UNION ALL " +
                " SELECT p.name,o.`status`,o.id AS orderId,DATE_FORMAT( o.create_time, '%Y-%m-%d %H:%i:%s' ) AS create_time, " +
                " SELECT p.name,o.`status`,o.id AS orderId,DATE_FORMAT( o.create_time, '%Y-%m-%d %H:%i:%s' ) AS create_time,p.id patientId, " +
                " GROUP_CONCAT( DISTINCT d.NAME SEPARATOR ',' ) AS doctorName, " +
                " GROUP_CONCAT( DISTINCT d.mobile SEPARATOR ',' ) AS dmobile, " +
                " p.mobile AS pmobile,p.address AS address,t.`name` AS orgName, " +
@@ -3901,7 +3901,7 @@ public class StatisticsService {
    public List<Map<String, Object>> findByPatientHelper(String patient){
        String sql = "SELECT ph.doctor,ph.doctor_name,d.mobile,d.qrcode  FROM base_patient_helper ph INNER JOIN base_doctor d ON d.id = ph.doctor WHERE  ph.del = 1 AND ph.patient = '"+patient+"'";
        String sql = "SELECT ph.doctor,ph.doctor_name,d.mobile,d.qrcode,d.photo  FROM base_patient_helper ph INNER JOIN base_doctor d ON d.id = ph.doctor WHERE  ph.del = 1 AND ph.patient = '"+patient+"'";
        return jdbcTemplate.queryForList(sql);
    }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/third/PatientInfoPlatFormService.java

@@ -169,6 +169,8 @@ public class PatientInfoPlatFormService {
            tmp.put("address",patientDO.getAddress());
            tmp.put("patient",patientDO.getId());
            tmp.put("pad_imei",patientDO.getPadImei());
            tmp.put("mobile",patientDO.getMobile());
            tmp.put("photo",patientDO.getPhoto());
            String idcard = patientDO.getIdcard();
            if (StringUtils.isNotBlank(idcard)){
                Integer age = IdCardUtil.getAgeForIdcard(idcard);
@@ -250,11 +252,13 @@ public class PatientInfoPlatFormService {
        emeWarn.put("unfinish",unfinish);
        emeWarn.put("finish",finish);
        //获取最近一次工单
        sql = " select o.id,p.id patient,p.name,p.idcard,p.residential_area,'20' OrderType,'1' type,o.serve_address,'紧急呼叫' serve_desc, " +
        sql = " select o.id,p.id patient,p.name,p.idcard,p.residential_area,'20' OrderType,'1' type,o.serve_address,'紧急呼叫' serve_desc,TIMESTAMPDIFF(YEAR,p.birthday,NOW()) AS age," +
                " CASE sex WHEN 1 THEN '男' WHEN 2 THEN '女' ELSE sex END AS sex, " +
                " o.status,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_emergency_assistance_order o INNER JOIN base_patient p on p.id = o.patient " +
                " where o.patient='"+patient+"' and o.`status` <>-1 " +
                " UNION " +
                "select o.id,p.id patient,p.name,p.idcard,p.residential_area,'22' OrderType,'1' type,o.serve_address,o.serve_desc, " +
                "select o.id,p.id patient,p.name,p.idcard,p.residential_area,'22' OrderType,'1' type,o.serve_address,o.serve_desc,TIMESTAMPDIFF(YEAR,p.birthday,NOW()) AS age, " +
                " CASE sex WHEN 1 THEN '男' WHEN 2 THEN '女' ELSE sex END AS sex, " +
                " o.status,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_security_monitoring_order o INNER JOIN base_patient p on p.id = o.patient " +
                " where o.patient='"+patient+"' and o.`status` <>-1 " +
                "ORDER BY create_time desc limit 1 ";
@@ -280,7 +284,8 @@ public class PatientInfoPlatFormService {
        olderService.put("unfinish",unfinish);
        olderService.put("finish",finish);
        //最近一次记录
        sql = " select o.id,p.name,p.id as patient,o.status,o.hospital_name hospitalName,p.idcard,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time,GROUP_CONCAT(DISTINCT fed.name SEPARATOR '、' ) serveItems " +
        sql = " select o.id,p.name,p.id as patient,o.status,o.hospital_name hospitalName,p.idcard,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time,GROUP_CONCAT(DISTINCT fed.name SEPARATOR '、' ) serveItems,TIMESTAMPDIFF(YEAR,p.birthday,NOW()) AS age," +
                " CASE sex WHEN 1 THEN '男' WHEN 2 THEN '女' ELSE sex END AS sex " +
                " from base_life_care_order o INNER JOIN base_patient p on o.patient = p.id INNER JOIN base_life_care_fee_detail fed on o.id = fed.order_id " +
                " and fed.status<>3 where o.patient='"+patient+"' and o.`status`<>-1 and o.`status`<>0  " +
                "GROUP BY o.id ORDER BY create_time desc limit 1; ";