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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/lifeCare/PadLifeCareEndpoint.java

@@ -103,7 +103,7 @@ public class PadLifeCareEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = "findItemDict")
    @ApiOperation(value = "查找服务项字典")
    public ListEnvelop findItemDict(@ApiParam(value = "orgCode", name = "orgCode")
                                    @RequestParam(value = "orgCode", required = true) String orgCode) {
                                    @RequestParam(value = "orgCode", required = false) String orgCode) {
        try {
            return ListEnvelop.getSuccess("查询成功",lifeCareOrderService.findItemDict(orgCode));
        }catch (Exception e){

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/lifeCare/PatientLifeCareEndpoint.java

@@ -138,7 +138,7 @@ public class PatientLifeCareEndpoint  extends EnvelopRestEndpoint {
    @GetMapping(value = "findItemDict")
    @ApiOperation(value = "查找服务项字典")
    public ListEnvelop findItemDict(@ApiParam(value = "orgCode", name = "orgCode")
                                   @RequestParam(value = "orgCode", required = true) String orgCode) {
                                   @RequestParam(value = "orgCode", required = false) String orgCode) {
        try {
            return ListEnvelop.getSuccess("查询成功",lifeCareOrderService.findItemDict(orgCode));
        }catch (Exception e){

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

@@ -349,7 +349,13 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
     * @return
     */
    public List<LifeCareItemDictDO> findItemDict(String orgCode){
        return lifeCareItemDictDao.findByOrgCode(orgCode);
        String sql = " select * from base_life_care_item_dict where 1=1 " ;
        if (StringUtils.isNotBlank(orgCode)){
            sql += " and org_code='"+orgCode+"' ";
        }
        sql+=  " and del=1 order by sort asc  ";
        List<LifeCareItemDictDO> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(LifeCareItemDictDO.class));
        return list;
    }
    /**

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

@@ -2083,21 +2083,25 @@ public class StatisticsService {
        JSONObject olderServiceInfo = new JSONObject();
        olderServiceInfo.put("finish",0);
        olderServiceInfo.put("unfinish",0);
        olderServiceInfo.put("total",0);
        olderServiceInfo.put("law",0);
        //紧急救助 呼叫+安防 指标67
        JSONObject emeAssistance = new JSONObject();
        emeAssistance.put("finish",0);
        emeAssistance.put("unfinish",0);
        olderServiceInfo.put("total",0);
        emeAssistance.put("law",0);
        //医生服务 老人健康咨询咨询+续方
        JSONObject doctorServiceInfo = new JSONObject();
        doctorServiceInfo.put("finish",0);
        doctorServiceInfo.put("unfinish",0);
        olderServiceInfo.put("total",0);
        doctorServiceInfo.put("law",0);
        //监测设备
        JSONObject monitorDevice = new JSONObject();
        monitorDevice.put("healthDevice",0);
        monitorDevice.put("securityDevice",0);
        olderServiceInfo.put("total",0);
        monitorDevice.put("offlineDevice",0);
        String areaFilter = "";
@@ -2122,6 +2126,7 @@ public class StatisticsService {
        sql = " select count(life.id) from base_life_care_order life where life.status in (1,3)  "+olderFilter.replace("{patient}","life.patient")+"  " ;
        unfinishCount = jdbcTemplate.queryForObject(sql,Long.class);
        olderServiceInfo.put("unfinish",unfinishCount);
        olderServiceInfo.put("total",finishCount.intValue()+unfinishCount.intValue());
        olderServiceInfo.put("law",commonUtil.getRangeDouble(finishCount.intValue(),(finishCount.intValue()+unfinishCount.intValue())));
        result.put("olderServiceInfo",olderServiceInfo);
@@ -2133,6 +2138,7 @@ public class StatisticsService {
        unfinishCount = saveModel2.getResult2().longValue();
        emeAssistance.put("finish",finishCount);
        emeAssistance.put("unfinish",unfinishCount);
        emeAssistance.put("total",finishCount.intValue()+unfinishCount.intValue());
        emeAssistance.put("law",commonUtil.getRangeDouble(finishCount.intValue(),(finishCount.intValue()+unfinishCount.intValue())));
        result.put("emeAssistance",emeAssistance);
@@ -2150,6 +2156,7 @@ public class StatisticsService {
        unfinishCount += jdbcTemplate.queryForObject(sql,Long.class);
        doctorServiceInfo.put("finish",finishCount);
        doctorServiceInfo.put("unfinish",unfinishCount);
        doctorServiceInfo.put("total",finishCount.intValue()+unfinishCount.intValue());
        doctorServiceInfo.put("law",commonUtil.getRangeDouble(finishCount.intValue(),(finishCount.intValue()+unfinishCount.intValue())));
        //监测设备
@@ -2166,6 +2173,7 @@ public class StatisticsService {
                "where (dev.contact_status=0 or dev.contact_status is null ) "+olderFilter.replace("{patient}","pd.user");
        count = jdbcTemplate.queryForObject(sql,Long.class);//离线设备
        monitorDevice.put("offlineDevice",count);
        monitorDevice.put("total",monitorDevice.getInteger("securityDevice")+monitorDevice.getInteger("healthDevice"));
        result.put("olderServiceInfo",olderServiceInfo);
        result.put("emeAssistance",emeAssistance);
@@ -2277,8 +2285,14 @@ public class StatisticsService {
                    " and mem.doctor_code = doc.id and mem.del=1 and doc.del=1 ";
            Integer count = jdbcTemplate.queryForObject(sql,Integer.class);
            map.put("doctorCount",count);
            SaveModel saveModel = elasticsearchUtil.findOneDateQuotaLevel1(DateUtil.getStringDateShort(), teamId, 5, "67", SaveModel.timeLevel_DDL,"-2,0,1");
            map.put("emeAssistanceCount",saveModel.getResult2().longValue());
            sql = " SELECT count(o.bussiness_id) " +
                    "FROM ( SELECT o.id AS bussiness_id,o.team_code as dept,o.`status`,o.update_time " +
                    "FROM base_security_monitoring_order o UNION ALL  " +
                    "SELECT o.id AS bussiness_id,o.team_code as dept,o.`status`,o.update_time " +
                    "FROM base_emergency_assistance_order o " +
                    ") o WHERE 1=1  and dept='"+teamId+"' and `status` in (-2,0,1) ";
            Long emeAssistanceCount = jdbcTemplate.queryForObject(sql,Long.class);
            map.put("emeAssistanceCount",emeAssistanceCount);
            sql = " SELECT count(o.id) FROM base_life_care_order o WHERE o.status<>0 and o.status<>-1  and EXISTS ( " +
                    " select 1 from base_service_package_sign_record sr,base_service_package_record r, base_service_package_item i," +
                    " base_service_package pack " +

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

@@ -224,12 +224,14 @@ public class PatientInfoPlatFormService {
        Integer unfinish=0;
        Integer finish=0;
        for (Map<String,Object> map:list){
            if ("0".equals(map.get("status").toString())){
                finish += Integer.parseInt(map.get("total").toString());
            }else {
                unfinish +=Integer.parseInt(map.get("total").toString());
            if (null!=map.get("status")){
                if ("0".equals(map.get("status").toString())){
                    finish += Integer.parseInt(map.get("total").toString());
                }else {
                    unfinish +=Integer.parseInt(map.get("total").toString());
                }
                all += Integer.parseInt(map.get("total").toString());
            }
            all += Integer.parseInt(map.get("total").toString());
        }
        emeWarn.put("all",all);
        emeWarn.put("unfinish",unfinish);
@@ -634,7 +636,7 @@ public class PatientInfoPlatFormService {
        String filter=" ";
        String sqltmp = "SELECT GROUP_CONCAT(dict_code) orgCodes from wlyy_hospital_sys_dict WHERE dict_name = 'jkzl_child' or dict_name = 'jkzl_older' ";
        List<Map<String,Object>> listtmp =  jdbcTemplate.queryForList(sqltmp);
        if(listtmp.size()>0){
        if(listtmp.size()>0&&StringUtils.isBlank(patient)){
            String orgCodes = String.valueOf(listtmp.get(0).get("orgCodes"));
            orgCodes = orgCodes.replaceAll(",","','");
            filter = " and ord.patient not in ('"+orgCodes+"') ";

svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/save/es/ElasticFactory.java

@@ -44,7 +44,7 @@ public class ElasticFactory {
     * @param "http://localhost:9200"
     * @return
     */
    public JestClient getJestClient() {
    public synchronized JestClient getJestClient() {
        if (factory == null) {
            //初始化链接
            init();

svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/job/business/CurrentMysqlToEsQuotaJob.java

@@ -269,6 +269,9 @@ public class CurrentMysqlToEsQuotaJob implements Job {
                case "4":
                    methodName = "getHospital";
                    break;
                case "5":
                    methodName = "getDept";
                    break;
                default:
                    methodName = "getDoctor";
                    break;