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

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/controller/JobController.java

@@ -337,6 +337,17 @@ public class JobController extends BaseController {
            return invalidUserException(e, -1, "启动失败:" + e.getMessage());
        }
    }
    @ApiOperation(value = "立即启动健康信息生成的任务")
    @RequestMapping(value = "startHealthMessageJobNow", method = RequestMethod.GET)
    public String startHealthMessageJobNow() {
        try {
            jobService.startHealthMessageJobNow();
            return success("启动成功！");
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "启动失败:" + e.getMessage());
        }
    }
    /**
     * 停止判断的任务
     *
@@ -451,6 +462,22 @@ public class JobController extends BaseController {
            return invalidUserException(e, -1, "启动失败:" + e.getMessage());
        }
    }
    /**
     * 启动通知任务
     *
     * @return
     */
    @ApiOperation(value = "立即启动通知任务")
    @RequestMapping(value = "startNoticeJobNow", method = RequestMethod.GET)
    public String startNoticeJobNow() {
        try {
            jobService.startNoticeJobNow();
            return success("启动成功！");
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "启动失败:" + e.getMessage());
        }
    }
    /**
     * 启动通知任务
     *

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/etl/dataFilter/SignDataFilter.java

@@ -81,6 +81,7 @@ public class SignDataFilter {
     *
     * @param signFamilies 签约列表
     * @param level2Key    二级维度的key
     *                       1:性别 2:年龄 3:分组 4:费用 5:健康服务分布 6:年龄 7:年龄疾病
     * @param filterDate   过滤的是哪天的数据 yyyy-MM-dd
     * @return
     */
@@ -93,7 +94,9 @@ public class SignDataFilter {
     *
     * @param signFamilies 签约列表
     * @param level2Key    二级维度的key
     *                       1:性别 2:年龄 3:分组 4:费用 5:健康服务分布 6:年龄 7:年龄疾病
     * @param level3Key    三级维度的key
     *                      1.疾病
     * @param filterDate   过滤的是哪天的数据 yyyy-MM-dd
     * @return
     */
@@ -106,7 +109,9 @@ public class SignDataFilter {
     *
     * @param signFamilies 签约列表
     * @param level2Key    二级维度的key
     *                       1:性别 2:年龄 3:分组 4:费用 5:健康服务分布 6:年龄 7:年龄疾病
     * @param level3Key    三级维度的key
     *                      1.疾病
     * @param filterDate   过滤的是哪天的数据 yyyy-MM-dd
     * @return
     */
@@ -295,7 +300,7 @@ public class SignDataFilter {
    /**
     * 得到二级维度的key
     *
     *1:性别 2:年龄 3:分组 4:费用 5:健康服务分布 6:年龄 7:年龄疾病
     * @param level2Key
     * @return
     */

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/etl/storage/DBStorage.java

@@ -200,7 +200,10 @@ public class DBStorage   {
     * @param type 1 性别 2 年龄 3 用户分组 4.签约费用 5 健康分布
     * @param start 起始位置 默认是1
     */
    public void saveByLevel2(List<Map<String, Map<String, List<ETLModel>>>> data, String day, WlyyQuotaVO wlyyQuota,Integer foreachNum,Integer type,Integer start)throws Exception {
    public void saveByLevel2(List<Map<String, Map<String, List<ETLModel>>>> data, String day, WlyyQuotaVO wlyyQuota,
                             Integer foreachNum,
                             Integer type,
                             Integer start)throws Exception {
        this.wlyyQuota=wlyyQuota;
        level2Public(data, day, foreachNum, type, start);
    }

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

@@ -462,8 +462,8 @@ public class JobService {
    public void startNoticeJob() throws Exception {
        if (!quartzHelper.isExistJob(NoticeJob.jobKey)) {
            quartzHelper.addJob(NoticeJob.class,NoticeJob.jobCron,NoticeJob.jobKey,new HashMap<>());
           // quartzHelper.startNow(NoticeJob.class, UUID.randomUUID().toString().replace("-", ""), new HashMap<>());
            quartzHelper.addJob(NoticeJob.class, NoticeJob.jobCron, NoticeJob.jobKey, new HashMap<>());
            // quartzHelper.startNow(NoticeJob.class, UUID.randomUUID().toString().replace("-", ""), new HashMap<>());
        } else {
            throw new Exception("已经启动");
@@ -478,11 +478,14 @@ public class JobService {
        }
    }
    /******************************* 随访计划任务 *******************************************************/
    /*******************************
     * 随访计划任务
     *******************************************************/
    @Value("${spring.followupMessage.jobId}")
    private String followupJob;
    @Value("${spring.followupMessage.cron}")
    private String followupJobCron;
    public void startFollowupPlantJob() throws Exception {
        if (!quartzHelper.isExistJob(followupJob)) {
            quartzHelper.addJob(FollowupPlanJob.class, followupJobCron, followupJob, new HashMap<>());
@@ -498,4 +501,13 @@ public class JobService {
            throw new Exception("已经停止");
        }
    }
    public void startNoticeJobNow() throws Exception {
        quartzHelper.startNow(NoticeJob.class, UUID.randomUUID().toString(), new HashMap<>());
    }
    public void startHealthMessageJobNow() throws Exception {
        quartzHelper.startNow(HealthMessageJob.class, UUID.randomUUID().toString(), new HashMap<>());
    }
}

patient-co-wlyy/pom.xml

@@ -75,7 +75,7 @@
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>java-ffmpegjave</artifactId>
            <artifactId>jave-ffmpegjave</artifactId>
            <version>1.0.4</version>
        </dependency>

patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/doctor/DoctorWorkTimeDao.java

@@ -5,6 +5,8 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by lyr on 2016/08/19.
 */
@@ -19,5 +21,6 @@ public interface DoctorWorkTimeDao extends PagingAndSortingRepository<WlyyDoctor
    @Query("select a from WlyyDoctorWorkTime a where a.doctor = ?1")
    WlyyDoctorWorkTime findDoctorWorkTime(String doctor);
    @Query("select a from WlyyDoctorWorkTime a where a.doctor = ?1")
    List<WlyyDoctorWorkTime> findDoctorWorkTimes(String doctor);
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/account/DoctorInfoService.java

@@ -105,6 +105,8 @@ public class DoctorInfoService extends BaseService {
    WeiXinAccessTokenUtils accessTokenUtils;
    @Autowired
    protected OperatorLogDao operatorLogDao;
    @Autowired
    private DoctorWorkTimeService doctorWorkTimeService;
    /**
     * 获取医生的签约病人
@@ -629,10 +631,14 @@ public class DoctorInfoService extends BaseService {
    public void setFamous(String doctorCode, Integer status) {
        Doctor doctor = doctorDao.findByCode(doctorCode);
        //如果是空或者大于1 默认是关闭名医
        if (status == null || status > 1) {
        if (status == null || status > 1 || status == 0) {
            status = 0;
            doctor.setIsFamous(status);
            //更新医生改成可以接受咨询
            doctorWorkTimeService.updateDoctorWorkTime(doctorCode);
        } else {
            doctor.setIsFamous(status);
        }
        doctor.setIsFamous(status);
    }
    @Transactional
@@ -881,7 +887,7 @@ public class DoctorInfoService extends BaseService {
        for (int i = 0; i < patiensString.length; i++) {
            try {
                updateTeamHealthDoctor(newDoctorCode, oldDoctorCode, patiensString[i]);
                ImUtill.deleteMucUser(newDoctorCode,oldDoctorCode,patiensString[i]+"_consult_2");
                ImUtill.deleteMucUser(newDoctorCode, oldDoctorCode, patiensString[i] + "_consult_2");
                successs++;
            } catch (Exception e) {
                error++;
@@ -913,7 +919,7 @@ public class DoctorInfoService extends BaseService {
                    if (updateTeamHealthDoctorAll(newDoctorCode, patient) == -1) {
                        hasNoTeam = true;
                    }
                    ImUtill.deleteMucUser(newDoctorCode,doctor,patient+"_consult_2");
                    ImUtill.deleteMucUser(newDoctorCode, doctor, patient + "_consult_2");
                } catch (Exception e) {
                    e.printStackTrace();
                }
@@ -1086,7 +1092,7 @@ public class DoctorInfoService extends BaseService {
        for (int i = 0; i < patiensString.length; i++) {
            try {
                ImUtill.deleteMucUser(newDoctorCode,oldDoctorCode,patiensString[i]+"_consult_2");
                ImUtill.deleteMucUser(newDoctorCode, oldDoctorCode, patiensString[i] + "_consult_2");
                updateTeamDoctor(newDoctorCode, oldDoctorCode, patiensString[i]);
                successs++;
            } catch (Exception e) {

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/scheduling/DoctorWorkTimeService.java

@@ -40,6 +40,16 @@ public class DoctorWorkTimeService extends BaseService {
    @Autowired
    private FamousDoctorTimesRemainDao timesRemainDao;
    @Transactional
    public void updateDoctorWorkTime(String doctorCode) {
        List<WlyyDoctorWorkTime> wlyyDoctorWorkTimess = doctorWorkTimeDao.findDoctorWorkTimes(doctorCode);
        if (wlyyDoctorWorkTimess != null && wlyyDoctorWorkTimess.size() > 0) {
            wlyyDoctorWorkTimess.stream().forEach( wt->{
                wt.setReceiveConsult("1");
            });
        }
    }
    /**
     * 查询医生工作时间列表
     *
@@ -58,10 +68,10 @@ public class DoctorWorkTimeService extends BaseService {
        result.put("workTime", workTime != null ? new JSONObject(workTime) : "");
        result.put("workWeeks", workWeekList != null ? new JSONArray(workWeekList) : "");
        JSONObject docJson = new JSONObject(doc);
        if(docJson.has("password")) {
        if (docJson.has("password")) {
            docJson.remove("password");
        }
        if(docJson.has("salt")) {
        if (docJson.has("salt")) {
            docJson.remove("salt");
        }
        result.put("doctor", doc != null ? docJson : "");
@@ -182,10 +192,10 @@ public class DoctorWorkTimeService extends BaseService {
            doctorWorkWeekDao.save(weeks);
        }
        if(doc.getIsFamous() != null && doc.getIsFamous() == 1){
            JSONObject json =  isDoctorWorkingToday(doctor);
        if (doc.getIsFamous() != null && doc.getIsFamous() == 1) {
            JSONObject json = isDoctorWorkingToday(doctor);
            if(json.getString("status").equals("1")){
            if (json.getString("status").equals("1")) {
                DoctorFamousConsultTimesRemain timesRemain = timesRemainDao.findByDoctorAndConsultDate(doctor,
                        new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
@@ -375,7 +385,7 @@ public class DoctorWorkTimeService extends BaseService {
     * @return
     * @throws Exception
     */
    public JSONObject isFamousDoctorWorking(String doctor) throws Exception{
    public JSONObject isFamousDoctorWorking(String doctor) throws Exception {
        JSONObject json = new JSONObject();
        Calendar calendar = Calendar.getInstance();
        int week = calendar.get(Calendar.DAY_OF_WEEK) - 1;
@@ -414,7 +424,7 @@ public class DoctorWorkTimeService extends BaseService {
                        int hour = calendar.get(Calendar.HOUR_OF_DAY);
                        int minute = calendar.get(Calendar.MINUTE);
                        String start = "";
                        String end ="";
                        String end = "";
                        String current = (hour < 10 ? ("0" + hour) : hour) + ":" + (hour < 10 ? ("0" + minute) : minute);
                        // 早上
@@ -441,7 +451,7 @@ public class DoctorWorkTimeService extends BaseService {
                            if (currentEnd.length() == 4) {
                                currentEnd = "0" + currentEnd;
                            }
                            if(StringUtils.isEmpty(start)) {
                            if (StringUtils.isEmpty(start)) {
                                start = currentStart;
                            }
                            end = currentEnd;
@@ -456,13 +466,13 @@ public class DoctorWorkTimeService extends BaseService {
                            if (currentEnd.length() == 4) {
                                currentEnd = "0" + currentEnd;
                            }
                            if(StringUtils.isEmpty(start)) {
                            if (StringUtils.isEmpty(start)) {
                                start = currentStart;
                            }
                            end = currentEnd;
                        }
                        if(current.compareTo(start) >= 0 && current.compareTo(end) < 0){
                        if (current.compareTo(start) >= 0 && current.compareTo(end) < 0) {
                            flag = 1;
                        }
@@ -604,9 +614,9 @@ public class DoctorWorkTimeService extends BaseService {
                        if (plus >= 0) {
                            timesRemain.setTimesRemain(timesRemain.getTimesRemain() + plus);
                        } else {
                            if(workTime.getFamousConsultTimes() >= Math.abs(plus)){
                                timesRemain.setTimesRemain(timesRemain.getTimesRemain()  - Math.abs(plus));
                            }else{
                            if (workTime.getFamousConsultTimes() >= Math.abs(plus)) {
                                timesRemain.setTimesRemain(timesRemain.getTimesRemain() - Math.abs(plus));
                            } else {
                                timesRemain.setTimesRemain(0);
                            }
                        }
@@ -706,7 +716,7 @@ public class DoctorWorkTimeService extends BaseService {
                    DoctorFamousConsultTimesRemain timesRemain = timesRemainDao.findByDoctorAndConsultDate(doc.getCode(), date);
                    if (timesRemain == null) {
                        timesRemain = new DoctorFamousConsultTimesRemain();
                    }else{
                    } else {
                        continue;
                    }
                    timesRemain.setDoctor(doc.getCode());

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/scheduling/DoctorWorkTimeController.java

@@ -132,10 +132,6 @@ public class DoctorWorkTimeController extends BaseController {
            if (StringUtils.isEmpty(receiveConsult)) {
                return error(-1, "是否接受咨询参数不能为空");
            }
            Doctor doc = doctorDao.findByCode(getUID());
            if(!(1==doc.getLevel())){
                return error(-1, "非专科医生无法关闭咨询");
            }
            if (doctorWorkTimeService.setDoctorReceiveConsult(getUID(), receiveConsult)) {
                return error(200, "设置成功");
            } else {

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/sign/FamilyContractController.java

@@ -441,13 +441,13 @@ public class FamilyContractController extends BaseController {
     */
    @RequestMapping(value = "sign")
    @ResponseBody
    public String sign(String doctor) {
    public String sign(String doctor,String patient) {
        try {
            if (StringUtils.isEmpty(doctor)) {
                return error(-1, "签约医生不能为空");
            }
            int result = familyContractService.sign(doctor, getUID());
            int result = familyContractService.sign(doctor,patient);
            if (result == -1) {
                return error(-1, "用户信息查询失败");

patient-co-wlyy/src/main/resources/system.properties

@@ -151,7 +151,7 @@ fastdfs_file_url=http://172.19.103.54:80/
##咨询回复
#template_consult_notice=-dr4QNyFoRvVsf8uWxXMC1dRyjwnbUuJwJ21vBLhf18
##签约成功
#template_sign_success=bw0_fVIxATsCuOwKYF8gzUyuZQ9IosC4Jf8ZU5IKMS4
#template_sign_success=VYGj8OUKj6FH4i4_nZS2UAHurJxQHx-7_OBPILIdB8s
##签约失败
#template_sign_failed=m221Jrkm0UUY00ExTCpQNTB8t_1U_V4LR9Bg8BgH9-o
##健康指导提醒