Merge remote-tracking branch 'origin/master-xlk-test' into master-xlk-test

fwq

2024-09-19 8bf18f1c6dd6084865efecf4a33f9f3e78739a64

Merge remote-tracking branch 'origin/master-xlk-test' into master-xlk-test

 phi_platform_user/src/main/java/com/hx/phip/controller/appointment/AppAutoMateController.java

@@ -312,6 +312,8 @@
        //用户操作时，对应个别时间为0
        if(dto.getOpType() == OperatorConstants.OP_TYPE_USER){
//            mzTime = 0;
            //默认标准轮匹配的实际面诊时长=系统面诊时长
            dto.setRealMzTime(mzTime);
            gtTime = 0;
//            sqTime = 0;
            waitDuration = 0;
@@ -475,7 +477,7 @@
        }

        ApponintmentVo aVo = null;
        ApponintmentVo aVo2 = null;
//        ApponintmentVo aVo2 = null;
        String deviceErr = null;

        //从医生可用时间里面，拼接出当天最小可以时间
@@ -609,15 +611,21 @@
                        //判断相同向下匹配
                        if(aVoList.size() > 0)
                        {
                            aVo2 = aVoList.get(0);
                            //遍历判断匹配时间是否重复，
                            boolean isRepeat = false;
                            for(ApponintmentVo apponintmentVo : aVoList){
                                if(
                                        (apponintmentVo.getStartTime().compareTo(aVo.getStartTime()) == 0 && apponintmentVo.getEndTime().compareTo(aVo.getEndTime()) == 0)
                                    // || (aVo2.getMzStartTime().compareTo(aVo.getMzStartTime()) == 0 && aVo2.getMzEndTime().compareTo(aVo.getMzEndTime()) == 0)
                                    // || (aVo2.getZlStartTime().compareTo(aVo.getZlStartTime()) ==0 && aVo2.getEndTime().compareTo(aVo.getEndTime()) == 0)
                                ){
                                    isRepeat = true;
                                   break;
                                }
                            }

                            if(
                                    (aVo2.getStartTime().compareTo(aVo.getStartTime()) == 0 && aVo2.getEndTime().compareTo(aVo.getEndTime()) == 0)
                                // || (aVo2.getMzStartTime().compareTo(aVo.getMzStartTime()) == 0 && aVo2.getMzEndTime().compareTo(aVo.getMzEndTime()) == 0)
                                // || (aVo2.getZlStartTime().compareTo(aVo.getZlStartTime()) ==0 && aVo2.getEndTime().compareTo(aVo.getEndTime()) == 0)
                            ){
                                upOrDown = 1;
                            }else{
                            //不重复则，存储对应可用
                            if(!isRepeat){
                                aVo.setHandleNum(handleNum);
                                aVo.setUpOrDown(upOrDown);
                                aVo.setProjectIds(projectIds);
@@ -638,6 +646,9 @@
                                    //如果是下午分隔的可以跳过
                                    break;
                                }
                            }else{
                                //重复则向下匹配
                                upOrDown = 1;
                            }
                        }else{
                            aVo.setHandleNum(handleNum);