Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co/patient-co-statistics-es/doc/es/统计新增索引.txt

@@ -87,7 +87,7 @@ POST http://172.19.103.68:9200/wlyy_quota_test/wlyy_quota_test/_mapping
                    "type": "double"
                },
                "result2": {
                    "type": "integer"
                    "type": "double"
                },
                "quotaDate": {
                    "type": "date"

patient-co/patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/service/JobService.java

@@ -106,9 +106,10 @@ public class JobService {
        BeanUtils.copyProperties(quartzJobConfig, wlyyJobConfigVO);
        Map<String, Object> params = new HashMap<String, Object>();
        params.put("jobConfig", wlyyJobConfigVO);
        params.put("jobConfig", wlyyJobConfigVO.getId());
        if (!StringUtils.isEmpty(quartzJobConfig.getJobClass())) {
            for (int j = 1; j <= 2; j++) {
                params.put("timeLevel", j + "");
                //往quartz框架添加任务
                quartzHelper.addJob(getRightClass(quartzJobConfig), quartzJobConfig.getQuartzCron(), quartzJobConfig.getId() + "-" + j, params);
               wlyyJobConfigDao.updateStatus(quartzJobConfig.getId(),"1") ;//设置任务状态是启动 }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/followup/FollowUpService.java

@@ -623,6 +623,22 @@ public class FollowUpService extends BaseService {
            followupContentDao.save(newList);
        }
    
        Followup followup = followupDao.findOne(Long.valueOf(id));
    
        //如果该随访是已完成的，则添加随访信息上传映射，上传到基卫
        if("1".equals(followup.getStatus())){
            FollowupMapping followupMapping = followUpMappingDao.findByFollowupId(Integer.parseInt(id));
            if(followupMapping == null){
                followupMapping = new FollowupMapping();
                followupMapping.setCode(UUID.randomUUID().toString());
                followupMapping.setFollowupId(Integer.parseInt(id));
                followupMapping.setUpdateTime(DateUtil.getNowTimestamp());
                followupMapping.setCreateTime(DateUtil.getNowTimestamp());
            }
            followupMapping.setNeedUpload(1);
            followUpMappingDao.save(followupMapping);
        }
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -1182,7 +1182,8 @@ public class FamilyContractService extends BaseService {
                participants.put(sf.getDoctor(), 0);
            } else {//全科和建管不同一个人
                participants.put(sf.getDoctorHealth(), 0);
                participants.put(sf.getDoctor(), 1);
//                participants.put(sf.getDoctor(), 1);
                participants.put(sf.getDoctor(), 0);//默认通知
            }
            //创建医生会话讨论组
            JSONObject sessionObj = ImUtill.createSession(participants, ImUtill.SESSION_TYPE_MUC, patient.getName(), patient.getCode() + "_" + sf.getTeamCode() + "_" + 2);
@@ -1529,7 +1530,8 @@ public class FamilyContractService extends BaseService {
                participants.put(sf.getDoctor(), 0);
            } else {//全科和建管不同一个人
                participants.put(sf.getDoctorHealth(), 0);
                participants.put(sf.getDoctor(), 1);
//                participants.put(sf.getDoctor(), 1);默认接收
                participants.put(sf.getDoctor(), 0);
            }
            Patient patient = patientDao.findByCode(sf.getPatient());
            //创建医生会话讨论组