修改市一同步时间范围（实时前1天，补救前5天）

陈昶聿

3 天以前 abae517585ad7ff0038c31339d200712c9684556

 smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java

@@ -1335,7 +1335,6 @@
        Map yeWuXX = (Map) dataMap.get("YeWuXX");
        Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
        ExternalInHospPatientInfo externalInHospPatientInfo = BeanUtil.mapToBean(BingRenXX, ExternalInHospPatientInfo.class, true);

        PatArchive patArchive = addPatArchive(externalInHospPatientInfo, null, null);


@@ -1356,6 +1355,10 @@
        patMedOperation.setPatid(patArchive.getId());
        patMedOperation.setPatcode(externalInHospPatientInfo.getBingRenID());
        patMedOperation.setPaname(externalInHospPatientInfo.getXingMing());
        patMedOperation.setLeaveldeptcode(externalInHospPatientInfo.getDangQianKSID());
        patMedOperation.setLeaveldeptname(externalInHospPatientInfo.getDangQianKSMC());
        patMedOperation.setLeavehospitaldistrictcode(externalInHospPatientInfo.getDangQianBQID());
        patMedOperation.setLeavehospitaldistrictname(externalInHospPatientInfo.getDangQianBQMC());
        patMedOperation.setOpreqcode(externalOperationInfo.getShenQingDID());
        //查询一下，该患者是否已经有这些数据
        List<PatMedOperation> patMedOperations = patMedOperationMapper.selectPatMedOperationList(patMedOperation);
@@ -1406,6 +1409,7 @@
            //丽水无院区，默认值是 1
            patMedOperation.setCampusid("1");
            patMedOperation.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID());
            patMedOperation.setInhospstate(externalInHospPatientInfo.getBingRenLXDM());
            patMedOperation.setInhospno(externalInHospPatientInfo.getBingAnHao());
            patMedOperation.setHospitalname(externalInHospPatientInfo.getZuZhiJGMC());
            patMedOperation.setHospitalcode(externalInHospPatientInfo.getZuZhiJGID());
@@ -1457,7 +1461,9 @@
            Boolean addMianTableFalg = true;
            for (ExternalOperationDetail externalOperationDetail : externalOperationDetails) {
                PatMedOperationItem patMedOperationItem = new PatMedOperationItem();
                patMedOperationItem.setOpid(patMedOperation.getOpid());
                if(ObjectUtils.isNotEmpty(patMedOperation.getId())){
                    patMedOperationItem.setOpid(patMedOperation.getId().toString());
                }
                patMedOperationItem.setOpcode(externalOperationDetail.getShouShuMCID());
                patMedOperationItem.setOpdesc(externalOperationDetail.getShouShuMC());
                patMedOperationItem.setMainFlag(externalOperationDetail.getZhuShouSBZ());
@@ -1468,12 +1474,17 @@
                patMedOperationItem.setOpposition(externalOperationDetail.getShouShuBW());
                patMedOperationItem.setDelFlag("0");
                patMedOperationItem.setOrgid(patMedOperation.getOrgid());
                patMedOperationItem.setInhospstate(patMedOperation.getInhospstate());
                patMedOperationItem.setSerialnum(patMedOperation.getSerialnum());
                //丽水无院区，默认值是 1
                patMedOperationItem.setCampusid("1");
                if (externalOperationDetail.getZhuShouSBZ().equals("1") && addMianTableFalg == true) {
                    patMedOperation.setOpcode(externalOperationDetail.getShouShuMCID());
                    patMedOperation.setOpdesc(externalOperationDetail.getShouShuMC());
//                    patMedOperation.setOpid(externalOperationDetail.getShouShuJBDM());
                    if(ObjectUtils.isNotEmpty(patMedOperation.getId())){
                        patMedOperation.setOpid(patMedOperation.getId().toString());
                    }

                    patMedOperation.setUpdateTime(new Date());
                    patMedOperationMapper.updatePatMedOperation(patMedOperation);
                    addMianTableFalg = false;
@@ -1973,6 +1984,12 @@
                log.info("手术申请入参类型为：{}", type);
                addOperationInfo(dataMap);
                return true;
            case "SM_SQ_ShouShuAP":
                log.info("手术安排入参类型为：{}", type);
                return true;
            case "SM_SQ_CheXiao":
                log.info("手术撤销入参类型为：{}", type);
                return true;
            case "TJ_YW_BaoGaoXX":
                log.info("体检报告入参类型为：{}", type);
                return true;